mwifiex: add custom IE framework

[deliverable/linux.git] / drivers / net / wireless / b43legacy / xmit.c

diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index 5188fab0b377aae80f5b46e904d78608dc6e16ad..a8012f2749eeb993c7691a66b4c636842678ba81 100644 (file)
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -228,6 +228,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
        } else {
                txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
                                                         info->control.vif,
+                                                        info->band,
                                                         fragment_len,
                                                         rate_fb);
        }
@@ -277,19 +278,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                phy_ctl |= B43legacy_TX4_PHY_ENC_OFDM;
        if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
                phy_ctl |= B43legacy_TX4_PHY_SHORTPRMBL;
-       switch (info->antenna_sel_tx) {
-       case 0:
-               phy_ctl |= B43legacy_TX4_PHY_ANTLAST;
-               break;
-       case 1:
-               phy_ctl |= B43legacy_TX4_PHY_ANT0;
-               break;
-       case 2:
-               phy_ctl |= B43legacy_TX4_PHY_ANT1;
-               break;
-       default:
-               B43legacy_BUG_ON(1);
-       }
+       phy_ctl |= B43legacy_TX4_PHY_ANTLAST;
 
        /* MAC control */
        rates = info->control.rates;