Skip to content

Commit

Permalink
compat-drivers: add wil6210 driver
Browse files Browse the repository at this point in the history
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
  • Loading branch information
hauke authored and mcgrof committed Jan 10, 2013
1 parent 8a03812 commit 02fbcae
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
6 changes: 6 additions & 0 deletions config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions patches/collateral-evolutions/network/0001-netdev_ops.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/admin-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 02fbcae

Please sign in to comment.