* cfg80211: allow set_interface without type
@ 2008-09-16 18:22 Johannes Berg
0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2008-09-16 18:22 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless
Which then causes no type change.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/wireless/nl80211.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
--- everything.orig/net/wireless/nl80211.c 2008-09-16 20:15:08.000000000 +0200
+++ everything/net/wireless/nl80211.c 2008-09-16 20:16:01.000000000 +0200
@@ -422,19 +422,20 @@ static int nl80211_set_interface(struct
memset(¶ms, 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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-09-16 18:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-16 18:22 cfg80211: allow set_interface without type Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox