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

Commit 96b78dff authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

nl80211/mac80211: Perform PLINK_ACTION on new station 



Modify the NEW_STATION command to accept PLINK_ACTIONS, in case
userspace wants to create stations and initiate a peer link right away
(for authenticated stations) or create a blocked station (for
debugging).

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 53e80511

net/mac80211/mesh_plink.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata, 
	if (!sta)

		return NULL;



	sta->flags = WLAN_STA_AUTHORIZED;

	sta->flags = WLAN_STA_AUTHORIZED | WLAN_STA_AUTH;

	sta->sta.supp_rates[local->hw.conf.channel->band] = rates;

	rate_control_rate_init(sta);

net/wireless/nl80211.c

+5 −0
Original line number Diff line number Diff line
@@ -2349,11 +2349,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) 
		params.ht_capa =

			nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]);



	if (info->attrs[NL80211_ATTR_STA_PLINK_ACTION])

		params.plink_action =

		    nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_ACTION]);



	if (parse_station_flags(info, &params))

		return -EINVAL;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)

		return -EINVAL;