Commit ff973af7 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by John W. Linville
Browse files

nl80211: allow installing keys for a meshif 



Signed-off-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9c3990aa

net/mac80211/cfg.c

+4 −1
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	mutex_lock(&sdata->local->sta_mtx);



	if (mac_addr) {

		if (ieee80211_vif_is_mesh(&sdata->vif))

			sta = sta_info_get(sdata, mac_addr);

		else

			sta = sta_info_get_bss(sdata, mac_addr);

		if (!sta) {

			ieee80211_key_free(sdata->local, key);

net/wireless/nl80211.c

+1 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ static int nl80211_key_allowed(struct wireless_dev *wdev) 
	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_MESH_POINT:

		break;

	case NL80211_IFTYPE_ADHOC:

		if (!wdev->current_bss)