cfg80211: Remove unused wiphy flag

The only user of WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS was removed
and consequently, this flag can be removed, too. In addition, a single
capability flag was not enough to indicate this capability clearly since
the device behavior may be different based on which operating mode is
being used.

Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d30eada7c6cd8e3dfab83cc065c59edf54eb7917..4932dfcb72b4ea8363d844a00032672e6d5288d9 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1455,8 +1455,6 @@ struct cfg80211_ops {
  *     control port protocol ethertype. The device also honours the
  *     control_port_no_encrypt flag.
  * @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN.
- * @WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS: The device supports separate
- *     unicast and multicast TX keys.
  * @WIPHY_FLAG_MESH_AUTH: The device supports mesh authentication by routing
  *     auth frames to userspace. See @NL80211_MESH_SETUP_USERSPACE_AUTH.
  */
@@ -1470,7 +1468,6 @@ enum wiphy_flags {
        WIPHY_FLAG_4ADDR_STATION                = BIT(6),
        WIPHY_FLAG_CONTROL_PORT_PROTOCOL        = BIT(7),
        WIPHY_FLAG_IBSS_RSN                     = BIT(8),
-       WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS= BIT(9),
        WIPHY_FLAG_MESH_AUTH                    = BIT(10),
 };
 

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 61877662e8f861c78e55038c2add50124098e848..d8be1986a10852750d96214a966164d848bba206 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -580,8 +580,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
        wiphy->flags |= WIPHY_FLAG_NETNS_OK |
                        WIPHY_FLAG_4ADDR_AP |
-                       WIPHY_FLAG_4ADDR_STATION |
-                       WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS;
+                       WIPHY_FLAG_4ADDR_STATION;
 
        if (!ops->set_key)
                wiphy->flags |= WIPHY_FLAG_IBSS_RSN;