compat-drivers: add wil6210 driver

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/config.mk b/config.mk
index fa2ce67992ef636d7fe761463d37e36a609670fa..084a21f4fb54fadbef984e0c196f9663fbe94c82 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -286,6 +286,11 @@ ifdef CONFIG_PCI
 export CONFIG_ATH5K_PCI=y
 export CONFIG_ATH9K_PCI=y
 
+ifndef CONFIG_COMPAT_KERNEL_2_6_31
+export CONFIG_WIL6210=m
+export CONFIG_WIL6210_ISR_COR=y
+endif #CONFIG_COMPAT_KERNEL_2_6_31
+
 export CONFIG_IWLWIFI=m
 export CONFIG_IWLDVM=m
 export CONFIG_IWLWIFI_P2P=y
@@ -650,6 +655,7 @@ endif #CONFIG_MAC80211_LEDS
 
 # Atheros
 export CONFIG_ATH_COMMON=m
+export CONFIG_ATH_CARDS=m
 # export CONFIG_ATH_DEBUG=y
 
 export CONFIG_BRCMUTIL=m

diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch
index efe1a2c2491b27fd3aec97ca59c8de6043e714a8..189c2ad0e13aacbe454e4e4560154d400b9b0d2b 100644 (file)
--- a/patches/collateral-evolutions/network/0001-netdev_ops.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch
@@ -69,6 +69,17 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        dev->destructor = free_netdev;
        dev->watchdog_timeo = ATH6KL_TX_TIMEOUT;
  
+--- a/drivers/net/wireless/ath/wil6210/netdev.c
++++ b/drivers/net/wireless/ath/wil6210/netdev.c
+@@ -104,7 +104,7 @@ void *wil_if_alloc(struct device *dev, v
+               goto out_priv;
+       }
+ 
+-      ndev->netdev_ops = &wil_netdev_ops;
++      netdev_attach_ops(ndev, &wil_netdev_ops);
+       ndev->ieee80211_ptr = wdev;
+       SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
+       wdev->netdev = ndev;
 --- a/drivers/net/wireless/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
 @@ -3442,7 +3442,7 @@ static int rndis_wlan_bind(struct usbnet

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 35b6a14930ec1be33973ff2101b3359d1e004ae9..ff6f0242ae8a9fd0b4d0665abf30b3716590cd73 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -338,6 +338,7 @@ DRIVERS_WLAN="drivers/net/wireless/ath
              drivers/net/wireless/ath/ath5k
              drivers/net/wireless/ath/ath6kl
              drivers/net/wireless/ath/ath9k
+             drivers/net/wireless/ath/wil6210
              drivers/ssb
              drivers/bcma
              drivers/net/wireless/b43