Commit 723b038d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: allow set_interface without type 



Which then causes no type change.

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

net/wireless/nl80211.c

+8 −7
Original line number Diff line number Diff line
@@ -422,19 +422,20 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info) 


	memset(&params, 0, sizeof(params));



	if (info->attrs[NL80211_ATTR_IFTYPE]) {

		type = nla_get_u32(info->attrs[NL80211_ATTR_IFTYPE]);

		if (type > NL80211_IFTYPE_MAX)

			return -EINVAL;

	} else

		return -EINVAL;



	err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);

	if (err)

		return err;

	ifindex = dev->ifindex;

	type = dev->ieee80211_ptr->iftype;

	dev_put(dev);



	err = -EINVAL;

	if (info->attrs[NL80211_ATTR_IFTYPE]) {

		type = nla_get_u32(info->attrs[NL80211_ATTR_IFTYPE]);

		if (type > NL80211_IFTYPE_MAX)

			goto unlock;

	}



	if (!drv->ops->change_virtual_intf ||

	    !(drv->wiphy.interface_modes & (1 << type))) {

		err = -EOPNOTSUPP;