diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-09 15:04:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 14:57:38 -0400 |
commit | e36d56b64808aec54b68b4e9976180c1da0933b2 (patch) | |
tree | 93f0e696d077b58d1064f3321d52b4611addf104 /net/mac80211/cfg.c | |
parent | e5a8a896f5180f2950695d2d0b79db348d200ca4 (diff) |
cfg80211: pass netdev to change_virtual_intf
If there was a reason I'm passing the ifidx I cannot
remember it any more and don't see one now, so let's
just pass the pointer itself.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 3f47276caeb8..eb93eb6a9cc7 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -74,19 +74,14 @@ static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex) | |||
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex, | 77 | static int ieee80211_change_iface(struct wiphy *wiphy, |
78 | struct net_device *dev, | ||
78 | enum nl80211_iftype type, u32 *flags, | 79 | enum nl80211_iftype type, u32 *flags, |
79 | struct vif_params *params) | 80 | struct vif_params *params) |
80 | { | 81 | { |
81 | struct net_device *dev; | ||
82 | struct ieee80211_sub_if_data *sdata; | 82 | struct ieee80211_sub_if_data *sdata; |
83 | int ret; | 83 | int ret; |
84 | 84 | ||
85 | /* we're under RTNL */ | ||
86 | dev = __dev_get_by_index(&init_net, ifindex); | ||
87 | if (!dev) | ||
88 | return -ENODEV; | ||
89 | |||
90 | if (!nl80211_type_check(type)) | 85 | if (!nl80211_type_check(type)) |
91 | return -EINVAL; | 86 | return -EINVAL; |
92 | 87 | ||