KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

b43: merge ad-hoc beacon fix

Browse source 
SVN-Revision: 28258
This commit is contained in:
Felix Fietkau 2011-09-19 09:59:00 +00:00
parent 32ae896d00
commit f4954abe39
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/mac80211/patches/300-pending_work.patch
View file

@ -2848,3 +2848,15 @@
} }
/* Note: country IE parsing is done for us by cfg80211 */ /* 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. */

2
package/mac80211/patches/800-b43-gpio-mask-module-option.patch
View file

@ -22,7 +22,7 @@
static int modparam_bad_frames_preempt; static int modparam_bad_frames_preempt;
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
MODULE_PARM_DESC(bad_frames_preempt, 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_MACCTL_GPOUTSMSK);
b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK) b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)

2
package/mac80211/patches/810-b43_no_pio.patch
View file

@ -11,7 +11,7 @@
b43-$(CONFIG_B43_PCMCIA) += pcmcia.o b43-$(CONFIG_B43_PCMCIA) += pcmcia.o
--- a/drivers/net/wireless/b43/main.c --- a/drivers/net/wireless/b43/main.c
+++ b/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]); dma_reason[4], dma_reason[5]);
b43err(dev->wl, "This device does not support DMA " b43err(dev->wl, "This device does not support DMA "
"on your system. It will now be switched to PIO.\n"); "on your system. It will now be switched to PIO.\n");