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>

diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index 4c80b09a858dc4aed6dcf7a3b6becb641f334d99..47b55855c37da0363bb213fc92a4491419f7eebf 100644 (file)
--- 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 31adb8cf0291fb0bbebf1a6896c8f4ff4d7288b9..4f38f19b8e3d373847778766ec8ad820e5d1d2bd 100644 (file)
--- 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