diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-09-19 09:59:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-19 09:59:00 +0000 |
| commit | f4954abe390b304a20959925bbfd04342ab5ca91 (patch) | |
| tree | 78b5ba3932f569edd3970e5756910b4e7bc80560 | |
| parent | 32ae896d0070a4db8061e179b3cdfe314ab4530a (diff) | |
| download | mtk-20170518-f4954abe390b304a20959925bbfd04342ab5ca91.zip mtk-20170518-f4954abe390b304a20959925bbfd04342ab5ca91.tar.gz mtk-20170518-f4954abe390b304a20959925bbfd04342ab5ca91.tar.bz2 | |
b43: merge ad-hoc beacon fix
SVN-Revision: 28258
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 12 | ||||
| -rw-r--r-- | package/mac80211/patches/800-b43-gpio-mask-module-option.patch | 2 | ||||
| -rw-r--r-- | package/mac80211/patches/810-b43_no_pio.patch | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 7a8e1b1..fde95c9 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -2848,3 +2848,15 @@ } /* Note: country IE parsing is done for us by cfg80211 */ +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -1613,7 +1613,8 @@ static void handle_irq_beacon(struct b43 + u32 cmd, beacon0_valid, beacon1_valid; + + if (!b43_is_mode(wl, NL80211_IFTYPE_AP) && +- !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT)) ++ !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) && ++ !b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) + return; + + /* This is the bottom half of the asynchronous beacon update. */ 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 ca6374f..0ee93fb 100644 --- a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch +++ b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch @@ -22,7 +22,7 @@ static int modparam_bad_frames_preempt; module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); MODULE_PARM_DESC(bad_frames_preempt, -@@ -2678,10 +2683,10 @@ static int b43_gpio_init(struct b43_wlde +@@ -2679,10 +2684,10 @@ static int b43_gpio_init(struct b43_wlde & ~B43_MACCTL_GPOUTSMSK); b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK) diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/mac80211/patches/810-b43_no_pio.patch index 9348f0a..3b242f0 100644 --- a/package/mac80211/patches/810-b43_no_pio.patch +++ b/package/mac80211/patches/810-b43_no_pio.patch @@ -11,7 +11,7 @@ b43-$(CONFIG_B43_PCMCIA) += pcmcia.o --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -1885,9 +1885,11 @@ static void b43_do_interrupt_thread(stru +@@ -1886,9 +1886,11 @@ static void b43_do_interrupt_thread(stru dma_reason[4], dma_reason[5]); b43err(dev->wl, "This device does not support DMA " "on your system. It will now be switched to PIO.\n"); |