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

cfg80211/nl80211: introduce p2p device types 



This adds P2P-STA and P2P-GO as device types so
we can distinguish between those and normal STA
or AP (respectively) type interfaces.

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

include/linux/nl80211.h

+4 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,8 @@ enum nl80211_attrs { 
 * @NL80211_IFTYPE_WDS: wireless distribution interface

 * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames

 * @NL80211_IFTYPE_MESH_POINT: mesh point

 * @NL80211_IFTYPE_P2P_CLIENT: P2P client

 * @NL80211_IFTYPE_P2P_GO: P2P group owner

 * @NL80211_IFTYPE_MAX: highest interface type number currently defined

 * @NUM_NL80211_IFTYPES: number of defined interface types

 *
@@ -1036,6 +1038,8 @@ enum nl80211_iftype { 
	NL80211_IFTYPE_WDS,

	NL80211_IFTYPE_MONITOR,

	NL80211_IFTYPE_MESH_POINT,

	NL80211_IFTYPE_P2P_CLIENT,

	NL80211_IFTYPE_P2P_GO,



	/* keep last */

	NUM_NL80211_IFTYPES,

net/wireless/core.c

+2 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
			dev->ethtool_ops = &cfg80211_ethtool_ops;



		if ((wdev->iftype == NL80211_IFTYPE_STATION ||

		     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT ||

		     wdev->iftype == NL80211_IFTYPE_ADHOC) && !wdev->use_4addr)

			dev->priv_flags |= IFF_DONT_BRIDGE;

		break;
@@ -734,6 +735,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
		case NL80211_IFTYPE_ADHOC:

			cfg80211_leave_ibss(rdev, dev, true);

			break;

		case NL80211_IFTYPE_P2P_CLIENT:

		case NL80211_IFTYPE_STATION:

			wdev_lock(wdev);

#ifdef CONFIG_CFG80211_WEXT

net/wireless/mlme.c

+2 −1
Original line number Diff line number Diff line
@@ -882,7 +882,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, 
		if (!wdev->current_bss ||

		    memcmp(wdev->current_bss->pub.bssid, mgmt->bssid,

			   ETH_ALEN) != 0 ||

		    (wdev->iftype == NL80211_IFTYPE_STATION &&

		    ((wdev->iftype == NL80211_IFTYPE_STATION ||

		      wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) &&

		     memcmp(wdev->current_bss->pub.bssid, mgmt->da,

			    ETH_ALEN) != 0)) {

			wdev_unlock(wdev);

net/wireless/nl80211.c

+39 −17
Original line number Diff line number Diff line
@@ -410,12 +410,14 @@ static int nl80211_key_allowed(struct wireless_dev *wdev) 
	switch (wdev->iftype) {

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_P2P_GO:

		break;

	case NL80211_IFTYPE_ADHOC:

		if (!wdev->current_bss)

			return -ENOLINK;

		break;

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_P2P_CLIENT:

		if (wdev->sme_state != CFG80211_SME_CONNECTED)

			return -ENOLINK;

		break;
@@ -766,7 +768,8 @@ static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev) 
		wdev->iftype == NL80211_IFTYPE_AP ||

		wdev->iftype == NL80211_IFTYPE_WDS ||

		wdev->iftype == NL80211_IFTYPE_MESH_POINT ||

		wdev->iftype == NL80211_IFTYPE_MONITOR;

		wdev->iftype == NL80211_IFTYPE_MONITOR ||

		wdev->iftype == NL80211_IFTYPE_P2P_GO;

}



static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,
@@ -1693,7 +1696,8 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info) 
	if (err)

		goto unlock_rtnl;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -1785,7 +1789,8 @@ static int nl80211_del_beacon(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -2128,10 +2133,12 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) 
	switch (dev->ieee80211_ptr->iftype) {

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_P2P_GO:

		/* disallow mesh-specific things */

		if (params.plink_action)

			err = -EINVAL;

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_STATION:

		/* disallow everything but AUTHORIZED flag */

		if (params.plink_action)
@@ -2233,7 +2240,8 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) 
		goto out_rtnl;



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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP_VLAN) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) {

		err = -EINVAL;

		goto out;

	}
@@ -2286,7 +2294,8 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info) 


	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_MESH_POINT &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) {

		err = -EINVAL;

		goto out;

	}
@@ -2660,7 +2669,8 @@ static int nl80211_set_bss(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -3363,6 +3373,7 @@ static int nl80211_send_bss(struct sk_buff *msg, u32 pid, u32 seq, int flags, 
	}



	switch (wdev->iftype) {

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_STATION:

		if (intbss == wdev->current_bss)

			NLA_PUT_U32(msg, NL80211_BSS_STATUS,
@@ -3649,7 +3660,8 @@ static int nl80211_authenticate(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -3804,7 +3816,8 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -3888,7 +3901,8 @@ static int nl80211_deauthenticate(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -3954,7 +3968,8 @@ static int nl80211_disassociate(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -4332,7 +4347,8 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) 
	if (err)

		goto unlock_rtnl;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -4408,7 +4424,8 @@ static int nl80211_disconnect(struct sk_buff *skb, struct genl_info *info) 
	if (err)

		goto unlock_rtnl;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -4496,7 +4513,8 @@ static int nl80211_setdel_pmksa(struct sk_buff *skb, struct genl_info *info) 
	pmksa.pmkid = nla_data(info->attrs[NL80211_ATTR_PMKID]);

	pmksa.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -4541,7 +4559,8 @@ static int nl80211_flush_pmksa(struct sk_buff *skb, struct genl_info *info) 
	if (err)

		goto out_rtnl;



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -4823,7 +4842,8 @@ static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info) 
		goto unlock_rtnl;



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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_ADHOC) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -4875,7 +4895,8 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info) 
	}



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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_ADHOC) {

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

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -5093,7 +5114,8 @@ static int nl80211_set_cqm_rssi(struct genl_info *info, 
		goto unlock_rdev;

	}



	if (wdev->iftype != NL80211_IFTYPE_STATION) {

	if (wdev->iftype != NL80211_IFTYPE_STATION &&

	    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) {

		err = -EOPNOTSUPP;

		goto unlock_rdev;

	}

net/wireless/sme.c

+6 −3
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, 


	ASSERT_WDEV_LOCK(wdev);



	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))

	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION &&

		    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))

		return;



	if (wdev->sme_state != CFG80211_SME_CONNECTING)
@@ -548,7 +549,8 @@ void __cfg80211_roamed(struct wireless_dev *wdev, const u8 *bssid, 


	ASSERT_WDEV_LOCK(wdev);



	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))

	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION &&

		    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))

		return;



	if (wdev->sme_state != CFG80211_SME_CONNECTED)
@@ -644,7 +646,8 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie, 


	ASSERT_WDEV_LOCK(wdev);



	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION))

	if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION &&

		    wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))

		return;



	if (wdev->sme_state != CFG80211_SME_CONNECTED)