diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2014-05-20 09:27:18 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-05-20 10:34:28 -0400 |
| commit | 24acfc632b7ba55bbc2a9305e8df31c8e41178b6 (patch) | |
| tree | 7ff3bc142299cde058d59c3dc9b54a6aed0cffa0 | |
| parent | ath9k_htc: fix build with disabled debug (diff) | |
| download | linux-dev-24acfc632b7ba55bbc2a9305e8df31c8e41178b6.tar.xz linux-dev-24acfc632b7ba55bbc2a9305e8df31c8e41178b6.zip | |
b43: xmit: set 5 GHz bit depending on current band
PHYs other than A may also work in 5 GHz mode.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/b43/phy_common.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h index 4c80b09a858d..47b55855c37d 100644 --- a/drivers/net/wireless/b43/phy_common.h +++ b/drivers/net/wireless/b43/phy_common.h @@ -231,7 +231,7 @@ struct b43_phy { /* HT info */ bool is_40mhz; - /* GMODE bit enabled? */ + /* Is GMODE (2 GHz mode) bit enabled? */ bool gmode; /* Analog Type */ diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 31adb8cf0291..4f38f19b8e3d 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -408,7 +408,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, mac_ctl |= B43_TXH_MAC_HWSEQ; if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT) mac_ctl |= B43_TXH_MAC_STMSDU; - if (phy->type == B43_PHYTYPE_A) + if (!phy->gmode) mac_ctl |= B43_TXH_MAC_5GHZ; /* Overwrite rates[0].count to make the retry calculation |