update xradio / sunxi-next to 4.14.17 (#884)
This commit is contained in:
parent
8e4d04e75d
commit
5d1b8df8d8
@ -1,28 +1,27 @@
|
||||
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
|
||||
index eeb5182..b9d756f 100644
|
||||
index 3d1ffcb..bed2537 100644
|
||||
--- a/drivers/net/wireless/Kconfig
|
||||
+++ b/drivers/net/wireless/Kconfig
|
||||
@@ -49,6 +49,8 @@ source "drivers/net/wireless/quantenna/Kconfig"
|
||||
source "drivers/net/wireless/rtl8812au/Kconfig"
|
||||
source "drivers/net/wireless/rtl8814au/Kconfig"
|
||||
source "drivers/net/wireless/rtl8189es/Kconfig"
|
||||
@@ -45,6 +45,7 @@ source "drivers/net/wireless/realtek/Kconfig"
|
||||
source "drivers/net/wireless/rsi/Kconfig"
|
||||
source "drivers/net/wireless/st/Kconfig"
|
||||
source "drivers/net/wireless/ti/Kconfig"
|
||||
+source "drivers/net/wireless/xradio/Kconfig"
|
||||
+
|
||||
|
||||
config PCMCIA_RAYCS
|
||||
tristate "Aviator/Raytheon 2.4GHz wireless support"
|
||||
source "drivers/net/wireless/zydas/Kconfig"
|
||||
source "drivers/net/wireless/quantenna/Kconfig"
|
||||
source "drivers/net/wireless/rtl8812au/Kconfig"
|
||||
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
|
||||
index d266826..5c86c4a 100644
|
||||
index d0fbe9c..2442af0 100644
|
||||
--- a/drivers/net/wireless/Makefile
|
||||
+++ b/drivers/net/wireless/Makefile
|
||||
@@ -19,6 +19,7 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/
|
||||
@@ -18,6 +18,7 @@ obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
|
||||
obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
|
||||
obj-$(CONFIG_WLAN_VENDOR_ST) += st/
|
||||
obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
|
||||
+obj-$(CONFIG_WLAN_VENDOR_XRADIO) += xradio/
|
||||
obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
|
||||
obj-$(CONFIG_WLAN_VENDOR_QUANTENNA) += quantenna/
|
||||
+obj-$(CONFIG_WLAN_VENDOR_XRADIO) += xradio/
|
||||
|
||||
# 16-bit wireless PCMCIA client drivers
|
||||
obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
|
||||
diff --git a/drivers/net/wireless/xradio/Kconfig b/drivers/net/wireless/xradio/Kconfig
|
||||
new file mode 100644
|
||||
index 0000000..dc73a39
|
||||
@ -482,7 +481,7 @@ index 0000000..80a9a14
|
||||
+
|
||||
diff --git a/drivers/net/wireless/xradio/ap.c b/drivers/net/wireless/xradio/ap.c
|
||||
new file mode 100644
|
||||
index 0000000..6487b3e
|
||||
index 0000000..6597fc9
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/wireless/xradio/ap.c
|
||||
@@ -0,0 +1,1624 @@
|
||||
@ -1656,7 +1655,7 @@ index 0000000..6487b3e
|
||||
+ .rate = 0xFF,
|
||||
+ };
|
||||
+
|
||||
+ frame.skb = ieee80211_nullfunc_get(priv->hw, priv->vif);
|
||||
+ frame.skb = ieee80211_nullfunc_get(priv->hw, priv->vif, false);
|
||||
+ if (WARN_ON(!frame.skb))
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
|
||||
Loading…
Reference in New Issue
Block a user