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 /drivers/net/wireless/iwmc3200wifi | |
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 'drivers/net/wireless/iwmc3200wifi')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/cfg80211.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c index 96f714e6e12..bc89b1ef0ca 100644 --- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c | |||
@@ -167,20 +167,15 @@ int iwm_cfg80211_inform_bss(struct iwm_priv *iwm) | |||
167 | return 0; | 167 | return 0; |
168 | } | 168 | } |
169 | 169 | ||
170 | static int iwm_cfg80211_change_iface(struct wiphy *wiphy, int ifindex, | 170 | static int iwm_cfg80211_change_iface(struct wiphy *wiphy, |
171 | struct net_device *ndev, | ||
171 | enum nl80211_iftype type, u32 *flags, | 172 | enum nl80211_iftype type, u32 *flags, |
172 | struct vif_params *params) | 173 | struct vif_params *params) |
173 | { | 174 | { |
174 | struct net_device *ndev; | ||
175 | struct wireless_dev *wdev; | 175 | struct wireless_dev *wdev; |
176 | struct iwm_priv *iwm; | 176 | struct iwm_priv *iwm; |
177 | u32 old_mode; | 177 | u32 old_mode; |
178 | 178 | ||
179 | /* we're under RTNL */ | ||
180 | ndev = __dev_get_by_index(&init_net, ifindex); | ||
181 | if (!ndev) | ||
182 | return -ENODEV; | ||
183 | |||
184 | wdev = ndev->ieee80211_ptr; | 179 | wdev = ndev->ieee80211_ptr; |
185 | iwm = ndev_to_iwm(ndev); | 180 | iwm = ndev_to_iwm(ndev); |
186 | old_mode = iwm->conf.mode; | 181 | old_mode = iwm->conf.mode; |