diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-07 11:28:11 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-07 11:28:11 +0000 |
| commit | d8db515de0a58dd4ef09d52519d1df2c260a65f9 (patch) | |
| tree | 591965ae3e7e4671400eff996096b8f4545d7338 /package/mac80211/patches/800-b43-gpio-mask-module-option.patch | |
| parent | 6c242e52a8451894639dfd36b8744b7a84eaef95 (diff) | |
mac80211: update to wireless-testing 2012-02-06
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30346 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/800-b43-gpio-mask-module-option.patch')
| -rw-r--r-- | package/mac80211/patches/800-b43-gpio-mask-module-option.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch index 08ac033cc..f3c278ee2 100644 --- a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch +++ b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -791,6 +791,7 @@ struct b43_wldev { +@@ -803,6 +803,7 @@ struct b43_wldev { bool qos_enabled; /* TRUE, if QoS is used. */ bool hwcrypto_enabled; /* TRUE, if HW crypto acceleration is enabled. */ bool use_pio; /* TRUE if next init should use PIO */ @@ -22,12 +22,12 @@ static int modparam_bad_frames_preempt; module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); MODULE_PARM_DESC(bad_frames_preempt, -@@ -2686,10 +2691,10 @@ static int b43_gpio_init(struct b43_wlde - & ~B43_MACCTL_GPOUTSMSK); +@@ -2674,10 +2679,10 @@ static int b43_gpio_init(struct b43_wlde + u32 mask, set; - b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK) -- | 0x000F); -+ | modparam_gpiomask); + b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0); +- b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF); ++ b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, modparam_gpiomask); mask = 0x0000001F; - set = 0x0000000F; |