diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-12-09 13:58:59 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:28 -0500 |
commit | dbd2fd656f2060abfd3a16257f8b51ec60f6d2ed (patch) | |
tree | 71e61430bd8593f2ad8f1c741b5a8a8be4a9d690 /drivers/net/wireless/rndis_wlan.c | |
parent | 897bed8b4320774e56f282cdc1cceb4d77442797 (diff) |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 19f3d568f700..4a4f00591447 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -554,7 +554,7 @@ static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev, | |||
554 | u8 key_index, bool pairwise, const u8 *mac_addr); | 554 | u8 key_index, bool pairwise, const u8 *mac_addr); |
555 | 555 | ||
556 | static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev, | 556 | static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev, |
557 | u8 key_index); | 557 | u8 key_index, bool unicast, bool multicast); |
558 | 558 | ||
559 | static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev, | 559 | static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev, |
560 | u8 *mac, struct station_info *sinfo); | 560 | u8 *mac, struct station_info *sinfo); |
@@ -2381,7 +2381,7 @@ static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev, | |||
2381 | } | 2381 | } |
2382 | 2382 | ||
2383 | static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev, | 2383 | static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev, |
2384 | u8 key_index) | 2384 | u8 key_index, bool unicast, bool multicast) |
2385 | { | 2385 | { |
2386 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); | 2386 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); |
2387 | struct usbnet *usbdev = priv->usbdev; | 2387 | struct usbnet *usbdev = priv->usbdev; |