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

Commit dbd2fd65 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211/nl80211: separate unicast/multicast default TX keys 



Allow userspace to specify that a given key
is default only for unicast and/or multicast
transmissions. Only WEP keys are for both,
WPA/RSN keys set here are GTKs for multicast
only. For more future flexibility, allow to
specify all combiations.

Wireless extensions can only set both so use
nl80211; WEP keys (connect keys) must be set
as default for both (but 802.1X WEP is still
possible).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 897bed8b

drivers/net/wireless/iwmc3200wifi/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -225,7 +225,8 @@ static int iwm_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 


static int iwm_cfg80211_set_default_key(struct wiphy *wiphy,

					struct net_device *ndev,

					u8 key_index)

					u8 key_index, bool unicast,

					bool multicast)

{

	struct iwm_priv *iwm = ndev_to_iwm(ndev);

drivers/net/wireless/libertas/cfg.c

+2 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,8 @@ static int lbs_cfg_disconnect(struct wiphy *wiphy, struct net_device *dev, 


static int lbs_cfg_set_default_key(struct wiphy *wiphy,

				   struct net_device *netdev,

				   u8 key_index)

				   u8 key_index, bool unicast,

				   bool multicast)

{

	struct lbs_private *priv = wiphy_priv(wiphy);

drivers/net/wireless/rndis_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev, 
			 u8 key_index, bool pairwise, const u8 *mac_addr);



static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev,

								u8 key_index);

				 u8 key_index, bool unicast, bool multicast);



static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev,

					u8 *mac, struct station_info *sinfo);
@@ -2381,7 +2381,7 @@ static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev, 
}



static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev,

								u8 key_index)

				 u8 key_index, bool unicast, bool multicast)

{

	struct rndis_wlan_private *priv = wiphy_priv(wiphy);

	struct usbnet *usbdev = priv->usbdev;

include/linux/nl80211.h

+27 −0
Original line number Diff line number Diff line
@@ -851,6 +851,10 @@ enum nl80211_commands { 
 *

 * @NL80211_ATTR_BSS_HTOPMODE: HT operation mode (u16)

 *

 * @NL80211_ATTR_KEY_DEFAULT_TYPES: A nested attribute containing flags

 *	attributes, specifying what a key should be set as default as.

 *	See &enum nl80211_key_default_types.

 *

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use

 */
@@ -1029,6 +1033,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_BSS_HT_OPMODE,



	NL80211_ATTR_KEY_DEFAULT_TYPES,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,
@@ -1774,6 +1780,23 @@ enum nl80211_wpa_versions { 
	NL80211_WPA_VERSION_2 = 1 << 1,

};



/**

 * enum nl80211_key_default_types - key default types

 * @__NL80211_KEY_DEFAULT_TYPE_INVALID: invalid

 * @NL80211_KEY_DEFAULT_TYPE_UNICAST: key should be used as default

 *	unicast key

 * @NL80211_KEY_DEFAULT_TYPE_MULTICAST: key should be used as default

 *	multicast key

 * @NUM_NL80211_KEY_DEFAULT_TYPES: number of default types

 */

enum nl80211_key_default_types {

	__NL80211_KEY_DEFAULT_TYPE_INVALID,

	NL80211_KEY_DEFAULT_TYPE_UNICAST,

	NL80211_KEY_DEFAULT_TYPE_MULTICAST,



	NUM_NL80211_KEY_DEFAULT_TYPES

};



/**

 * enum nl80211_key_attributes - key attributes

 * @__NL80211_KEY_INVALID: invalid
@@ -1790,6 +1813,9 @@ enum nl80211_wpa_versions { 
 * @NL80211_KEY_TYPE: the key type from enum nl80211_key_type, if not

 *	specified the default depends on whether a MAC address was

 *	given with the command using the key or not (u32)

 * @NL80211_KEY_DEFAULT_TYPES: A nested attribute containing flags

 *	attributes, specifying what a key should be set as default as.

 *	See &enum nl80211_key_default_types.

 * @__NL80211_KEY_AFTER_LAST: internal

 * @NL80211_KEY_MAX: highest key attribute

 */
@@ -1802,6 +1828,7 @@ enum nl80211_key_attributes { 
	NL80211_KEY_DEFAULT,

	NL80211_KEY_DEFAULT_MGMT,

	NL80211_KEY_TYPE,

	NL80211_KEY_DEFAULT_TYPES,



	/* keep last */

	__NL80211_KEY_AFTER_LAST,

include/net/cfg80211.h

+4 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ struct cfg80211_ops { 
			   u8 key_index, bool pairwise, const u8 *mac_addr);

	int	(*set_default_key)(struct wiphy *wiphy,

				   struct net_device *netdev,

				   u8 key_index);

				   u8 key_index, bool unicast, bool multicast);

	int	(*set_default_mgmt_key)(struct wiphy *wiphy,

					struct net_device *netdev,

					u8 key_index);
@@ -1393,6 +1393,8 @@ 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.

 */

enum wiphy_flags {

	WIPHY_FLAG_CUSTOM_REGULATORY		= BIT(0),
@@ -1404,6 +1406,7 @@ 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),

};



struct mac_address {