aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2011-05-04 01:50:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-05 14:59:17 -0400
commitf0dc7999b54ae0464d7144b81d21e1d39a389d49 (patch)
tree29f5a6017fdb92a70033e3d3107a7075d49a291b
parent0e579d6a8f4aea346da818f13ee71401c125e639 (diff)
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>
-rw-r--r--include/net/cfg80211.h3
-rw-r--r--net/mac80211/main.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d30eada7c6cd..4932dfcb72b4 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1455,8 +1455,6 @@ struct cfg80211_ops {
1455 * control port protocol ethertype. The device also honours the 1455 * control port protocol ethertype. The device also honours the
1456 * control_port_no_encrypt flag. 1456 * control_port_no_encrypt flag.
1457 * @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN. 1457 * @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN.
1458 * @WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS: The device supports separate
1459 * unicast and multicast TX keys.
1460 * @WIPHY_FLAG_MESH_AUTH: The device supports mesh authentication by routing 1458 * @WIPHY_FLAG_MESH_AUTH: The device supports mesh authentication by routing
1461 * auth frames to userspace. See @NL80211_MESH_SETUP_USERSPACE_AUTH. 1459 * auth frames to userspace. See @NL80211_MESH_SETUP_USERSPACE_AUTH.
1462 */ 1460 */
@@ -1470,7 +1468,6 @@ enum wiphy_flags {
1470 WIPHY_FLAG_4ADDR_STATION = BIT(6), 1468 WIPHY_FLAG_4ADDR_STATION = BIT(6),
1471 WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7), 1469 WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7),
1472 WIPHY_FLAG_IBSS_RSN = BIT(8), 1470 WIPHY_FLAG_IBSS_RSN = BIT(8),
1473 WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS= BIT(9),
1474 WIPHY_FLAG_MESH_AUTH = BIT(10), 1471 WIPHY_FLAG_MESH_AUTH = BIT(10),
1475}; 1472};
1476 1473
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 61877662e8f8..d8be1986a108 100644
--- 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,
580 580
581 wiphy->flags |= WIPHY_FLAG_NETNS_OK | 581 wiphy->flags |= WIPHY_FLAG_NETNS_OK |
582 WIPHY_FLAG_4ADDR_AP | 582 WIPHY_FLAG_4ADDR_AP |
583 WIPHY_FLAG_4ADDR_STATION | 583 WIPHY_FLAG_4ADDR_STATION;
584 WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS;
585 584
586 if (!ops->set_key) 585 if (!ops->set_key)
587 wiphy->flags |= WIPHY_FLAG_IBSS_RSN; 586 wiphy->flags |= WIPHY_FLAG_IBSS_RSN;