1 files changed, 7 insertions, 9 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index ec8f53467374..c9d2175d15c1 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -140,6 +140,8 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
                         if (r->flags & IEEE80211_RATE_MANDATORY_A)
                                 mrate = r->bitrate;
                         break;
+                case IEEE80211_BAND_60GHZ:
+                        /* TODO, for now fall through */
                 case IEEE80211_NUM_BANDS:
                         WARN_ON(1);
                         break;
@@ -957,8 +959,7 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
                         info->control.rates[1].idx = -1;
                         info->control.rates[2].idx = -1;
                         info->control.rates[3].idx = -1;
-                        info->control.rates[4].idx = -1;
-                        BUILD_BUG_ON(IEEE80211_TX_MAX_RATES != 5);
+                        BUILD_BUG_ON(IEEE80211_TX_MAX_RATES != 4);
                         info->flags &= ~IEEE80211_TX_CTL_RATE_CTRL_PROBE;
                 } else {
                         hdr->frame_control &= ~morefrags;
@@ -1293,11 +1294,8 @@ static bool __ieee80211_tx(struct ieee80211_local *local,
                 break;
         }
 
-        if (local->ops->tx_frags)
-                drv_tx_frags(local, vif, pubsta, skbs);
-        else
-                result = ieee80211_tx_frags(local, vif, pubsta, skbs,
-                                            txpending);
+        result = ieee80211_tx_frags(local, vif, pubsta, skbs,
+                                    txpending);
 
         ieee80211_tpt_led_trig_tx(local, fc, led_len);
         ieee80211_led_tx(local, 1);
@@ -2420,9 +2418,9 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                 *pos++ = WLAN_EID_SSID;
                 *pos++ = 0x0;
 
-                if (ieee80211_add_srates_ie(&sdata->vif, skb, true) ||
+                if (ieee80211_add_srates_ie(sdata, skb, true) ||
                     mesh_add_ds_params_ie(skb, sdata) ||
-                    ieee80211_add_ext_srates_ie(&sdata->vif, skb, true) ||
+                    ieee80211_add_ext_srates_ie(sdata, skb, true) ||
                     mesh_add_rsn_ie(skb, sdata) ||
                     mesh_add_ht_cap_ie(skb, sdata) ||
                     mesh_add_ht_oper_ie(skb, sdata) ||