浏览代码

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>
Rafał Miłecki 11 年之前
父节点
当前提交
24acfc632b
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/net/wireless/b43/phy_common.h
  2. 1 1
      drivers/net/wireless/b43/xmit.c

+ 1 - 1
drivers/net/wireless/b43/phy_common.h

@@ -231,7 +231,7 @@ struct b43_phy {
 	/* HT info */
 	/* HT info */
 	bool is_40mhz;
 	bool is_40mhz;
 
 
-	/* GMODE bit enabled? */
+	/* Is GMODE (2 GHz mode) bit enabled? */
 	bool gmode;
 	bool gmode;
 
 
 	/* Analog Type */
 	/* Analog Type */

+ 1 - 1
drivers/net/wireless/b43/xmit.c

@@ -408,7 +408,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
 		mac_ctl |= B43_TXH_MAC_HWSEQ;
 		mac_ctl |= B43_TXH_MAC_HWSEQ;
 	if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
 	if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
 		mac_ctl |= B43_TXH_MAC_STMSDU;
 		mac_ctl |= B43_TXH_MAC_STMSDU;
-	if (phy->type == B43_PHYTYPE_A)
+	if (!phy->gmode)
 		mac_ctl |= B43_TXH_MAC_5GHZ;
 		mac_ctl |= B43_TXH_MAC_5GHZ;
 
 
 	/* Overwrite rates[0].count to make the retry calculation
 	/* Overwrite rates[0].count to make the retry calculation