mac80211: refresh patch
SVN-Revision: 33937
This commit is contained in:
parent
8d69af7c9f
commit
cae349b5ad
1 changed files with 4 additions and 10 deletions
|
@ -1,8 +1,6 @@
|
||||||
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
|
|
||||||
index 73730e9..7358ea2 100644
|
|
||||||
--- 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
|
||||||
@@ -4652,7 +4652,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
|
@@ -4645,7 +4645,7 @@ static int b43_wireless_core_init(struct
|
||||||
switch (dev->dev->bus_type) {
|
switch (dev->dev->bus_type) {
|
||||||
#ifdef CONFIG_B43_BCMA
|
#ifdef CONFIG_B43_BCMA
|
||||||
case B43_BUS_BCMA:
|
case B43_BUS_BCMA:
|
||||||
|
@ -11,11 +9,9 @@ index 73730e9..7358ea2 100644
|
||||||
dev->dev->bdev, true);
|
dev->dev->bdev, true);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
|
||||||
index b89f127..de96290 100644
|
|
||||||
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
||||||
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
||||||
@@ -692,7 +692,7 @@ void ai_pci_up(struct si_pub *sih)
|
@@ -697,7 +697,7 @@ void ai_pci_up(struct si_pub *sih)
|
||||||
sii = container_of(sih, struct si_info, pub);
|
sii = container_of(sih, struct si_info, pub);
|
||||||
|
|
||||||
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
||||||
|
@ -24,7 +20,7 @@ index b89f127..de96290 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Unconfigure and/or apply various WARs when going down */
|
/* Unconfigure and/or apply various WARs when going down */
|
||||||
@@ -703,7 +703,7 @@ void ai_pci_down(struct si_pub *sih)
|
@@ -708,7 +708,7 @@ void ai_pci_down(struct si_pub *sih)
|
||||||
sii = container_of(sih, struct si_info, pub);
|
sii = container_of(sih, struct si_info, pub);
|
||||||
|
|
||||||
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
||||||
|
@ -33,11 +29,9 @@ index b89f127..de96290 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enable BT-COEX & Ex-PA for 4313 */
|
/* Enable BT-COEX & Ex-PA for 4313 */
|
||||||
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
||||||
index 75086b3..565c15a 100644
|
|
||||||
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
||||||
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
||||||
@@ -5077,7 +5077,7 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
|
@@ -5079,7 +5079,7 @@ static int brcms_b_up_prep(struct brcms_
|
||||||
* Configure pci/pcmcia here instead of in brcms_c_attach()
|
* Configure pci/pcmcia here instead of in brcms_c_attach()
|
||||||
* to allow mfg hotswap: down, hotswap (chip power cycle), up.
|
* to allow mfg hotswap: down, hotswap (chip power cycle), up.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue