8 files changed, 98 insertions, 57 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index fd6860d7f557..ff090ef1ea2c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -428,11 +428,13 @@ void sta_set_rate_info_tx(struct sta_info *sta,
                 rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
         }
         if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-                rinfo->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-        if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
-                rinfo->flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;
-        if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
-                rinfo->flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;
+                rinfo->bw = RATE_INFO_BW_40;
+        else if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
+                rinfo->bw = RATE_INFO_BW_80;
+        else if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
+                rinfo->bw = RATE_INFO_BW_160;
+        else
+                rinfo->bw = RATE_INFO_BW_20;
         if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
                 rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
 }
@@ -459,16 +461,21 @@ void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
                 rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
         }
 
-        if (sta->last_rx_rate_flag & RX_FLAG_40MHZ)
-                rinfo->flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
         if (sta->last_rx_rate_flag & RX_FLAG_SHORT_GI)
                 rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
-        if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80MHZ)
-                rinfo->flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;
-        if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80P80MHZ)
-                rinfo->flags |= RATE_INFO_FLAGS_80P80_MHZ_WIDTH;
-        if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_160MHZ)
-                rinfo->flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;
+
+        if (sta->last_rx_rate_flag & RX_FLAG_5MHZ)
+                rinfo->bw = RATE_INFO_BW_5;
+        else if (sta->last_rx_rate_flag & RX_FLAG_10MHZ)
+                rinfo->bw = RATE_INFO_BW_10;
+        else if (sta->last_rx_rate_flag & RX_FLAG_40MHZ)
+                rinfo->bw = RATE_INFO_BW_40;
+        else if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_80MHZ)
+                rinfo->bw = RATE_INFO_BW_80;
+        else if (sta->last_rx_rate_vht_flag & RX_VHT_FLAG_160MHZ)
+                rinfo->bw = RATE_INFO_BW_160;
+        else
+                rinfo->bw = RATE_INFO_BW_20;
 }
 
 static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c0711082a2b8..1875181ebd94 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2453,6 +2453,12 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata,
         sdata_assert_lock(sdata);
 
         if (!assoc) {
+                /*
+                 * we are not authenticated yet, the only timer that could be
+                 * running is the timeout for the authentication response which
+                 * which is not relevant anymore.
+                 */
+                del_timer_sync(&sdata->u.mgd.timer);
                 sta_info_destroy_addr(sdata, auth_data->bss->bssid);
 
                 memset(sdata->u.mgd.bssid, 0, ETH_ALEN);
@@ -2760,6 +2766,12 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata,
         sdata_assert_lock(sdata);
 
         if (!assoc) {
+                /*
+                 * we are not associated yet, the only timer that could be
+                 * running is the timeout for the association response which
+                 * which is not relevant anymore.
+                 */
+                del_timer_sync(&sdata->u.mgd.timer);
                 sta_info_destroy_addr(sdata, assoc_data->bss->bssid);
 
                 memset(sdata->u.mgd.bssid, 0, ETH_ALEN);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3a1a3ba40bd8..3d79d498e7f6 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -361,9 +361,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
                 u16 known = local->hw.radiotap_vht_details;
 
                 rthdr->it_present |= cpu_to_le32(1 << IEEE80211_RADIOTAP_VHT);
-                /* known field - how to handle 80+80? */
-                if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)
-                        known &= ~IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
                 put_unaligned_le16(known, pos);
                 pos += 2;
                 /* flags */
@@ -378,8 +375,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
                 /* bandwidth */
                 if (status->vht_flag & RX_VHT_FLAG_80MHZ)
                         *pos++ = 4;
-                else if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)
-                        *pos++ = 0; /* marked not known above */
                 else if (status->vht_flag & RX_VHT_FLAG_160MHZ)
                         *pos++ = 11;
                 else if (status->flag & RX_FLAG_40MHZ)
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 788707f05516..e679b7c9b160 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -730,7 +730,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
         struct ieee80211_bar *bar;
         int rtap_len;
         int shift = 0;
-        int tid = IEEE80211_NUM_TIDS;;
+        int tid = IEEE80211_NUM_TIDS;
 
         rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count);
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 83ba6cd9cf8d..fbd37d43dfce 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2541,7 +2541,9 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
                 ri.mcs = status->rate_idx;
                 ri.flags |= RATE_INFO_FLAGS_MCS;
                 if (status->flag & RX_FLAG_40MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
+                        ri.bw = RATE_INFO_BW_40;
+                else
+                        ri.bw = RATE_INFO_BW_20;
                 if (status->flag & RX_FLAG_SHORT_GI)
                         ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
         } else if (status->flag & RX_FLAG_VHT) {
@@ -2549,13 +2551,13 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
                 ri.mcs = status->rate_idx;
                 ri.nss = status->vht_nss;
                 if (status->flag & RX_FLAG_40MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-                if (status->vht_flag & RX_VHT_FLAG_80MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;
-                if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_80P80_MHZ_WIDTH;
-                if (status->vht_flag & RX_VHT_FLAG_160MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;
+                        ri.bw = RATE_INFO_BW_40;
+                else if (status->vht_flag & RX_VHT_FLAG_80MHZ)
+                        ri.bw = RATE_INFO_BW_80;
+                else if (status->vht_flag & RX_VHT_FLAG_160MHZ)
+                        ri.bw = RATE_INFO_BW_160;
+                else
+                        ri.bw = RATE_INFO_BW_20;
                 if (status->flag & RX_FLAG_SHORT_GI)
                         ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
         } else {
@@ -2563,10 +2565,15 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
                 int shift = 0;
                 int bitrate;
 
-                if (status->flag & RX_FLAG_10MHZ)
+                if (status->flag & RX_FLAG_10MHZ) {
                         shift = 1;
-                if (status->flag & RX_FLAG_5MHZ)
+                        ri.bw = RATE_INFO_BW_10;
+                } else if (status->flag & RX_FLAG_5MHZ) {
                         shift = 2;
+                        ri.bw = RATE_INFO_BW_5;
+                } else {
+                        ri.bw = RATE_INFO_BW_20;
+                }
 
                 sband = local->hw.wiphy->bands[status->band];
                 bitrate = sband->bitrates[status->rate_idx].bitrate;
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 456e4c38c279..3af0ecf1cc16 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -21,7 +21,6 @@
 #include <linux/sched.h>
 #include <net/genetlink.h>
 #include <net/cfg80211.h>
-#include <net/rtnetlink.h>
 #include "nl80211.h"
 #include "core.h"
 #include "sysfs.h"
@@ -964,10 +963,6 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev,
 }
 EXPORT_SYMBOL(cfg80211_stop_iface);
 
-static const struct rtnl_link_ops wireless_link_ops = {
-        .kind = "wlan",
-};
-
 static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                                          unsigned long state, void *ptr)
 {
@@ -986,7 +981,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
         switch (state) {
         case NETDEV_POST_INIT:
                 SET_NETDEV_DEVTYPE(dev, &wiphy_type);
-                dev->rtnl_link_ops = &wireless_link_ops;
                 break;
         case NETDEV_REGISTER:
                 /*
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4ed9039bd5f9..4fc812f2b583 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3580,6 +3580,7 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
         struct nlattr *rate;
         u32 bitrate;
         u16 bitrate_compat;
+        enum nl80211_attrs rate_flg;
 
         rate = nla_nest_start(msg, attr);
         if (!rate)
@@ -3596,12 +3597,36 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
             nla_put_u16(msg, NL80211_RATE_INFO_BITRATE, bitrate_compat))
                 return false;
 
+        switch (info->bw) {
+        case RATE_INFO_BW_5:
+                rate_flg = NL80211_RATE_INFO_5_MHZ_WIDTH;
+                break;
+        case RATE_INFO_BW_10:
+                rate_flg = NL80211_RATE_INFO_10_MHZ_WIDTH;
+                break;
+        default:
+                WARN_ON(1);
+                /* fall through */
+        case RATE_INFO_BW_20:
+                rate_flg = 0;
+                break;
+        case RATE_INFO_BW_40:
+                rate_flg = NL80211_RATE_INFO_40_MHZ_WIDTH;
+                break;
+        case RATE_INFO_BW_80:
+                rate_flg = NL80211_RATE_INFO_80_MHZ_WIDTH;
+                break;
+        case RATE_INFO_BW_160:
+                rate_flg = NL80211_RATE_INFO_160_MHZ_WIDTH;
+                break;
+        }
+
+        if (rate_flg && nla_put_flag(msg, rate_flg))
+                return false;
+
         if (info->flags & RATE_INFO_FLAGS_MCS) {
                 if (nla_put_u8(msg, NL80211_RATE_INFO_MCS, info->mcs))
                         return false;
-                if (info->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_40_MHZ_WIDTH))
-                        return false;
                 if (info->flags & RATE_INFO_FLAGS_SHORT_GI &&
                     nla_put_flag(msg, NL80211_RATE_INFO_SHORT_GI))
                         return false;
@@ -3610,18 +3635,6 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
                         return false;
                 if (nla_put_u8(msg, NL80211_RATE_INFO_VHT_NSS, info->nss))
                         return false;
-                if (info->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_40_MHZ_WIDTH))
-                        return false;
-                if (info->flags & RATE_INFO_FLAGS_80_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_80_MHZ_WIDTH))
-                        return false;
-                if (info->flags & RATE_INFO_FLAGS_80P80_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_80P80_MHZ_WIDTH))
-                        return false;
-                if (info->flags & RATE_INFO_FLAGS_160_MHZ_WIDTH &&
-                    nla_put_flag(msg, NL80211_RATE_INFO_160_MHZ_WIDTH))
-                        return false;
                 if (info->flags & RATE_INFO_FLAGS_SHORT_GI &&
                     nla_put_flag(msg, NL80211_RATE_INFO_SHORT_GI))
                         return false;
@@ -11784,7 +11797,7 @@ void cfg80211_del_sta_sinfo(struct net_device *dev, const u8 *mac_addr,
                 return;
 
         if (nl80211_send_station(msg, NL80211_CMD_DEL_STATION, 0, 0, 0,
-                                 rdev, dev, mac_addr, sinfo)) {
+                                 rdev, dev, mac_addr, sinfo) < 0) {
                 nlmsg_free(msg);
                 return;
         }
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 1d2fcfad06cc..97c744eeac4f 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1073,10 +1073,24 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
         if (WARN_ON_ONCE(rate->mcs > 9))
                 return 0;
 
-        idx = rate->flags & (RATE_INFO_FLAGS_160_MHZ_WIDTH |
-                             RATE_INFO_FLAGS_80P80_MHZ_WIDTH) ? 3 :
-                  rate->flags & RATE_INFO_FLAGS_80_MHZ_WIDTH ? 2 :
-                  rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH ? 1 : 0;
+        switch (rate->bw) {
+        case RATE_INFO_BW_160:
+                idx = 3;
+                break;
+        case RATE_INFO_BW_80:
+                idx = 2;
+                break;
+        case RATE_INFO_BW_40:
+                idx = 1;
+                break;
+        case RATE_INFO_BW_5:
+        case RATE_INFO_BW_10:
+        default:
+                WARN_ON(1);
+                /* fall through */
+        case RATE_INFO_BW_20:
+                idx = 0;
+        }
 
         bitrate = base[idx][rate->mcs];
         bitrate *= rate->nss;
@@ -1107,8 +1121,7 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate)
         modulation = rate->mcs & 7;
         streams = (rate->mcs >> 3) + 1;
 
-        bitrate = (rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH) ?
-                        13500000 : 6500000;
+        bitrate = (rate->bw == RATE_INFO_BW_40) ? 13500000 : 6500000;
 
         if (modulation < 4)
                 bitrate *= (modulation + 1);