wext: remove a/b/g/n from SIOCGIWNAME

Since a/b/g/n no longer exist as spec amendements and VHT (ex 802.11ac)
wasn't handled at all, it's better to just remove the amendment strings
to avoid confusion.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 4c89f0ca61ba0d2dde70efdf579062a3a90cced5..9f27221c89135d5d54b814baf26378c599d95ac2 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -25,42 +25,7 @@ int cfg80211_wext_giwname(struct net_device *dev,
                          struct iw_request_info *info,
                          char *name, char *extra)
 {
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct ieee80211_supported_band *sband;
-       bool is_ht = false, is_a = false, is_b = false, is_g = false;
-
-       if (!wdev)
-               return -EOPNOTSUPP;
-
-       sband = wdev->wiphy->bands[NL80211_BAND_5GHZ];
-       if (sband) {
-               is_a = true;
-               is_ht |= sband->ht_cap.ht_supported;
-       }
-
-       sband = wdev->wiphy->bands[NL80211_BAND_2GHZ];
-       if (sband) {
-               int i;
-               /* Check for mandatory rates */
-               for (i = 0; i < sband->n_bitrates; i++) {
-                       if (sband->bitrates[i].bitrate == 10)
-                               is_b = true;
-                       if (sband->bitrates[i].bitrate == 60)
-                               is_g = true;
-               }
-               is_ht |= sband->ht_cap.ht_supported;
-       }
-
        strcpy(name, "IEEE 802.11");
-       if (is_a)
-               strcat(name, "a");
-       if (is_b)
-               strcat(name, "b");
-       if (is_g)
-               strcat(name, "g");
-       if (is_ht)
-               strcat(name, "n");
-
        return 0;
 }
 EXPORT_WEXT_HANDLER(cfg80211_wext_giwname);