diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-13 19:35:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-04-13 19:35:40 +0000 |
| commit | 6af575967c780fa41029bdb64fdd68646ab516d1 (patch) | |
| tree | bf5fa402a077278c773200cb2aa941cc0b9e6883 /package | |
| parent | 3f240440c76765426018151ab3ea019547108326 (diff) | |
| download | upstream-6af575967c780fa41029bdb64fdd68646ab516d1.tar.gz upstream-6af575967c780fa41029bdb64fdd68646ab516d1.tar.bz2 upstream-6af575967c780fa41029bdb64fdd68646ab516d1.zip | |
kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing
SVN-Revision: 31278
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/patches/880-brcmsmac_suspend_signature.patch | 13 | ||||
| -rw-r--r-- | package/mac80211/patches/890-b43legay-antenna-gain.patch | 11 |
2 files changed, 11 insertions, 13 deletions
diff --git a/package/mac80211/patches/880-brcmsmac_suspend_signature.patch b/package/mac80211/patches/880-brcmsmac_suspend_signature.patch deleted file mode 100644 index c38e76a488..0000000000 --- a/package/mac80211/patches/880-brcmsmac_suspend_signature.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove this patch when we get a new version of bcma into our kernel. - ---- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c -@@ -1129,7 +1129,7 @@ static int __devinit brcms_bcma_probe(st - return 0; - } - --static int brcms_suspend(struct bcma_device *pdev) -+static int brcms_suspend(struct bcma_device *pdev, pm_message_t state) - { - struct brcms_info *wl; - struct ieee80211_hw *hw; diff --git a/package/mac80211/patches/890-b43legay-antenna-gain.patch b/package/mac80211/patches/890-b43legay-antenna-gain.patch new file mode 100644 index 0000000000..9c1510a0ca --- /dev/null +++ b/package/mac80211/patches/890-b43legay-antenna-gain.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/b43legacy/phy.c ++++ b/drivers/net/wireless/b43legacy/phy.c +@@ -1860,7 +1860,7 @@ void b43legacy_phy_xmitpower(struct b43l + * which accounts for the factor of 4 */ + #define REG_MAX_PWR 20 + max_pwr = min(REG_MAX_PWR * 4 +- - dev->dev->bus->sprom.antenna_gain.ghz24.a0 ++ - dev->dev->bus->sprom.antenna_gain.a0 + - 0x6, max_pwr); + + /* find the desired power in Q5.2 - power_level is in dBm |