mac80211: update to wireless-testing 2012-06-14
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 842-brcmsmac-remove-ai_get_buscoretype-and-ai_get_buscor.patch
1 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
2 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
3 @@ -471,9 +471,6 @@ ai_buscore_setup(struct si_info *sii, st
4 sii->pub.pmurev = sii->pub.pmucaps & PCAP_REV_MASK;
5 }
6
7 - /* figure out buscore */
8 - sii->buscore = ai_findcore(&sii->pub, PCIE_CORE_ID, 0);
9 -
10 return true;
11 }
12
13 @@ -806,15 +803,3 @@ bool ai_deviceremoved(struct si_pub *sih
14
15 return false;
16 }
17 -
18 -uint ai_get_buscoretype(struct si_pub *sih)
19 -{
20 - struct si_info *sii = (struct si_info *)sih;
21 - return sii->buscore->id.id;
22 -}
23 -
24 -uint ai_get_buscorerev(struct si_pub *sih)
25 -{
26 - struct si_info *sii = (struct si_info *)sih;
27 - return sii->buscore->id.rev;
28 -}
29 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
30 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
31 @@ -168,7 +168,6 @@ struct si_info {
32 struct si_pub pub; /* back plane public state (must be first) */
33 struct bcma_bus *icbus; /* handle to soc interconnect bus */
34 struct pci_dev *pcibus; /* handle to pci bus */
35 - struct bcma_device *buscore;
36
37 u32 chipst; /* chip status */
38 };
39 @@ -202,9 +201,6 @@ extern void ai_pci_up(struct si_pub *sih
40 /* Enable Ex-PA for 4313 */
41 extern void ai_epa_4313war(struct si_pub *sih);
42
43 -extern uint ai_get_buscoretype(struct si_pub *sih);
44 -extern uint ai_get_buscorerev(struct si_pub *sih);
45 -
46 static inline u32 ai_get_cccaps(struct si_pub *sih)
47 {
48 return sih->cccaps;