summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-25 21:41:52 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-25 21:41:52 +0000
commit32f81d1ba7a656b76e0beeb0aea38216988a3a3a (patch)
treeb3f9756d0fcc8c9d6380cefbef89768e505f48e2
parent0b1b6a028308ee9df70d00a9de2fafd2538ac01c (diff)
mac80211: refresh patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33937 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/840-b43-brcmsmac-use-pcie-core-arry.patch14
1 files changed, 4 insertions, 10 deletions
diff --git a/package/mac80211/patches/840-b43-brcmsmac-use-pcie-core-arry.patch b/package/mac80211/patches/840-b43-brcmsmac-use-pcie-core-arry.patch
index 6d4c1d8b8b..e5f4ed0b3c 100644
--- a/package/mac80211/patches/840-b43-brcmsmac-use-pcie-core-arry.patch
+++ b/package/mac80211/patches/840-b43-brcmsmac-use-pcie-core-arry.patch
@@ -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
+++ 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) {
#ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA:
@@ -11,11 +9,9 @@ index 73730e9..7358ea2 100644
dev->dev->bdev, true);
break;
#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
+++ 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);
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
@@ -24,7 +20,7 @@ index b89f127..de96290 100644
}
/* 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);
if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
@@ -33,11 +29,9 @@ index b89f127..de96290 100644
}
/* 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
+++ 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()
* to allow mfg hotswap: down, hotswap (chip power cycle), up.
*/