On Thu, 2009-06-04 at 18:19 +0100, Dave wrote:
> Johannes Berg wrote:
> > 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@xxxxxxxxxxxxxxxx>
> > ---
> > drivers/net/wireless/iwmc3200wifi/cfg80211.c | 9 ++-------
> > include/net/cfg80211.h | 3 ++-
> > net/mac80211/cfg.c | 9 ++-------
> > net/wireless/nl80211.c | 12 +++++-------
> > net/wireless/wext-compat.c | 2 +-
> > 5 files changed, 12 insertions(+), 23 deletions(-)
>
> rndis_wlan.c will need an update for this as well
Sorry! I totally missed that. Thanks for the patch, John can you roll
that in and properly credit Dave for it?
johannes
>
> Dave.
> ---
> diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
> index c254fdf..230962e 100644
> --- a/drivers/net/wireless/rndis_wlan.c
> +++ b/drivers/net/wireless/rndis_wlan.c
> @@ -420,7 +420,8 @@ struct rndis_wext_private {
> /*
> * cfg80211 ops
> */
> -static int rndis_change_virtual_intf(struct wiphy *wiphy, int ifindex,
> +static int rndis_change_virtual_intf(struct wiphy *wiphy,
> + struct net_device *dev,
> enum nl80211_iftype type, u32 *flags,
> struct vif_params *params);
>
> @@ -1222,20 +1223,14 @@ static void set_multicast_list(struct usbnet *usbdev)
> /*
> * cfg80211 ops
> */
> -static int rndis_change_virtual_intf(struct wiphy *wiphy, int ifindex,
> +static int rndis_change_virtual_intf(struct wiphy *wiphy,
> + struct net_device *dev,
> enum nl80211_iftype type, u32 *flags,
> struct vif_params *params)
> {
> - struct net_device *dev;
> - struct usbnet *usbdev;
> + struct usbnet *usbdev = netdev_priv(dev);
> int mode;
>
> - /* we're under RTNL */
> - dev = __dev_get_by_index(&init_net, ifindex);
> - if (!dev)
> - return -ENODEV;
> - usbdev = netdev_priv(dev);
> -
> switch (type) {
> case NL80211_IFTYPE_ADHOC:
> mode = ndis_80211_infra_adhoc;
>
>
>
>
Attachment:
signature.asc
Description: This is a digitally signed message part
