Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0dc7999 authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

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: default avatarJouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e579d6a

include/net/cfg80211.h

+0 −3
Original line number Diff line number Diff line
@@ -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),

};

net/mac80211/main.c

+1 −2
Original line number Diff line number Diff line
@@ -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;