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

cfg80211/mac80211: allow per-station GTKs 



This adds API to allow adding per-station GTKs,
updates mac80211 to support it, and also allows
drivers to remove a key from hwaccel again when
this may be necessary due to multiple GTKs.

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

drivers/net/wireless/iwmc3200wifi/cfg80211.c

+4 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int iwm_key_init(struct iwm_key *key, u8 key_index, 
}



static int iwm_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

				u8 key_index, const u8 *mac_addr,

				u8 key_index, bool pairwise, const u8 *mac_addr,

				struct key_params *params)

{

	struct iwm_priv *iwm = ndev_to_iwm(ndev);
@@ -181,7 +181,8 @@ static int iwm_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int iwm_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,

				u8 key_index, const u8 *mac_addr, void *cookie,

				u8 key_index, bool pairwise, const u8 *mac_addr,

				void *cookie,

				void (*callback)(void *cookie,

						 struct key_params*))

{
@@ -206,7 +207,7 @@ static int iwm_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, 




static int iwm_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

				u8 key_index, const u8 *mac_addr)

				u8 key_index, bool pairwise, const u8 *mac_addr)

{

	struct iwm_priv *iwm = ndev_to_iwm(ndev);

	struct iwm_key *key = &iwm->keys[key_index];

drivers/net/wireless/libertas/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ static int lbs_cfg_set_default_key(struct wiphy *wiphy, 




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

			   u8 idx, const u8 *mac_addr,

			   u8 idx, bool pairwise, const u8 *mac_addr,

			   struct key_params *params)

{

	struct lbs_private *priv = wiphy_priv(wiphy);
@@ -1498,7 +1498,7 @@ static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev, 




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

			   u8 key_index, const u8 *mac_addr)

			   u8 key_index, bool pairwise, const u8 *mac_addr)

{



	lbs_deb_enter(LBS_DEB_CFG80211);

drivers/net/wireless/rndis_wlan.c

+6 −6
Original line number Diff line number Diff line
@@ -540,11 +540,11 @@ static int rndis_set_channel(struct wiphy *wiphy, struct net_device *dev, 
	struct ieee80211_channel *chan, enum nl80211_channel_type channel_type);



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

					u8 key_index, const u8 *mac_addr,

			 u8 key_index, bool pairwise, const u8 *mac_addr,

			 struct key_params *params);



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

					u8 key_index, const u8 *mac_addr);

			 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);
@@ -2308,7 +2308,7 @@ static int rndis_set_channel(struct wiphy *wiphy, struct net_device *netdev, 
}



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

					u8 key_index, const u8 *mac_addr,

			 u8 key_index, bool pairwise, const u8 *mac_addr,

			 struct key_params *params)

{

	struct rndis_wlan_private *priv = wiphy_priv(wiphy);
@@ -2344,7 +2344,7 @@ static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, 
}



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

					u8 key_index, const u8 *mac_addr)

			 u8 key_index, bool pairwise, const u8 *mac_addr)

{

	struct rndis_wlan_private *priv = wiphy_priv(wiphy);

	struct usbnet *usbdev = priv->usbdev;

include/linux/nl80211.h

+12 −0
Original line number Diff line number Diff line
@@ -801,6 +801,9 @@ enum nl80211_commands { 
 *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING

 *      for non-automatic settings.

 *

 * @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly

 *	means support for per-station GTKs.

 *

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use

 */
@@ -968,6 +971,8 @@ enum nl80211_attrs { 
	NL80211_ATTR_CONTROL_PORT_ETHERTYPE,

	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,



	NL80211_ATTR_SUPPORT_IBSS_RSN,



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



	__NL80211_ATTR_AFTER_LAST,
@@ -1659,11 +1664,14 @@ enum nl80211_auth_type { 
 * @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key

 * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key

 * @NL80211_KEYTYPE_PEERKEY: PeerKey (DLS)

 * @NUM_NL80211_KEYTYPES: number of defined key types

 */

enum nl80211_key_type {

	NL80211_KEYTYPE_GROUP,

	NL80211_KEYTYPE_PAIRWISE,

	NL80211_KEYTYPE_PEERKEY,



	NUM_NL80211_KEYTYPES

};



/**
@@ -1694,6 +1702,9 @@ enum nl80211_wpa_versions { 
 *	CCMP keys, each six bytes in little endian

 * @NL80211_KEY_DEFAULT: flag indicating default key

 * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key

 * @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_AFTER_LAST: internal

 * @NL80211_KEY_MAX: highest key attribute

 */
@@ -1705,6 +1716,7 @@ enum nl80211_key_attributes { 
	NL80211_KEY_SEQ,

	NL80211_KEY_DEFAULT,

	NL80211_KEY_DEFAULT_MGMT,

	NL80211_KEY_TYPE,



	/* keep last */

	__NL80211_KEY_AFTER_LAST,

include/net/cfg80211.h

+6 −3
Original line number Diff line number Diff line
@@ -1130,13 +1130,14 @@ struct cfg80211_ops { 
				       struct vif_params *params);



	int	(*add_key)(struct wiphy *wiphy, struct net_device *netdev,

			   u8 key_index, const u8 *mac_addr,

			   u8 key_index, bool pairwise, const u8 *mac_addr,

			   struct key_params *params);

	int	(*get_key)(struct wiphy *wiphy, struct net_device *netdev,

			   u8 key_index, const u8 *mac_addr, void *cookie,

			   u8 key_index, bool pairwise, const u8 *mac_addr,

			   void *cookie,

			   void (*callback)(void *cookie, struct key_params*));

	int	(*del_key)(struct wiphy *wiphy, struct net_device *netdev,

			   u8 key_index, const u8 *mac_addr);

			   u8 key_index, bool pairwise, const u8 *mac_addr);

	int	(*set_default_key)(struct wiphy *wiphy,

				   struct net_device *netdev,

				   u8 key_index);
@@ -1304,6 +1305,7 @@ struct cfg80211_ops { 
 * @WIPHY_FLAG_CONTROL_PORT_PROTOCOL: This device supports setting the

 *	control port protocol ethertype. The device also honours the

 *	control_port_no_encrypt flag.

 * @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN.

 */

enum wiphy_flags {

	WIPHY_FLAG_CUSTOM_REGULATORY		= BIT(0),
@@ -1314,6 +1316,7 @@ enum wiphy_flags { 
	WIPHY_FLAG_4ADDR_AP			= BIT(5),

	WIPHY_FLAG_4ADDR_STATION		= BIT(6),

	WIPHY_FLAG_CONTROL_PORT_PROTOCOL	= BIT(7),

	WIPHY_FLAG_IBSS_RSN			= BIT(7),

};



struct mac_address {

CRA Git | Maintained and supported by SUSTech CRA and CCSE