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

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

cfg80211: show interface type 



This patch makes cfg80211 show the interface in the nl80211
information about a specific interface. API users are required
to keep the type updated (everything else is fairly complicated)
but you will get a warning if you fail to keep it updated.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 133b8226

include/net/cfg80211.h

+4 −2
Original line number Diff line number Diff line
@@ -363,11 +363,13 @@ struct wiphy; 
 * wireless extensions but this is subject to reevaluation as soon as this

 * code is used more widely and we have a first user without wext.

 *

 * @add_virtual_intf: create a new virtual interface with the given name

 * @add_virtual_intf: create a new virtual interface with the given name,

 *	must set the struct wireless_dev's iftype.

 *

 * @del_virtual_intf: remove the virtual interface determined by ifindex.

 *

 * @change_virtual_intf: change type of virtual interface

 * @change_virtual_intf: change type/configuration of virtual interface,

 *	keep the struct wireless_dev's iftype updated.

 *

 * @add_key: add a key with the given parameters. @mac_addr will be %NULL

 *	when adding a group key.

include/net/wireless.h

+2 −0
Original line number Diff line number Diff line
@@ -223,9 +223,11 @@ struct wiphy { 
 * the netdev.)

 *

 * @wiphy: pointer to hardware description

 * @iftype: interface type

 */

struct wireless_dev {

	struct wiphy *wiphy;

	enum nl80211_iftype iftype;



	/* private to the generic wireless code */

	struct list_head list;

net/mac80211/iface.c

+1 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 
	/* and set some type-dependent values */

	sdata->vif.type = type;

	sdata->dev->hard_start_xmit = ieee80211_subif_start_xmit;

	sdata->wdev.iftype = type;



	/* only monitor differs */

	sdata->dev->type = ARPHRD_ETHER;

net/wireless/core.c

+2 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 


	rdev = wiphy_to_dev(dev->ieee80211_ptr->wiphy);



	WARN_ON(dev->ieee80211_ptr->iftype == NL80211_IFTYPE_UNSPECIFIED);



	switch (state) {

	case NETDEV_REGISTER:

		mutex_lock(&rdev->devlist_mtx);

net/wireless/nl80211.c

+5 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags, 


	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, dev->ifindex);

	NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, dev->name);

	/* TODO: interface type */

	NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, dev->ieee80211_ptr->iftype);

	return genlmsg_end(msg, hdr);



 nla_put_failure:
@@ -453,6 +453,10 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info) 
				  &flags);

	err = drv->ops->change_virtual_intf(&drv->wiphy, ifindex,

					    type, err ? NULL : &flags, &params);



	dev = __dev_get_by_index(&init_net, ifindex);

	WARN_ON(!dev || (!err && dev->ieee80211_ptr->iftype != type));



	rtnl_unlock();



 unlock: