From cfe1982273ad0a3fd42e9a0711c65b6044a4c639 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Thu, 17 Sep 2015 18:32:20 +0900 Subject: [PATCH] local/net: bcm4358: fix netdevice notifier to use info struct After commit 351638e7deeed2ec8ce451b53d3 (net: pass info struct via netdevice notifier), the struct netdev_notifier_info is passed to netdevice notifier. So this patch fixes wl_cfg80211_netdev_notifier_call() to use the info struct. Signed-off-by: Seung-Woo Kim --- drivers/net/wireless/bcmdhd4358/wl_cfg80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c b/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c index 84672f3..8bef620 100644 --- a/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd4358/wl_cfg80211.c @@ -10504,9 +10504,9 @@ static void wl_scan_timeout(unsigned long data) static s32 wl_cfg80211_netdev_notifier_call(struct notifier_block * nb, unsigned long state, - void *ndev) + void *info) { - struct net_device *dev = ndev; + struct net_device *dev = netdev_notifier_info_to_dev(info); struct wireless_dev *wdev = dev->ieee80211_ptr; struct bcm_cfg80211 *cfg = g_bcm_cfg; @@ -10554,7 +10554,7 @@ wl_cfg80211_netdev_notifier_call(struct notifier_block * nb, case NETDEV_UNREGISTER: /* after calling list_del_rcu(&wdev->list) */ - wl_dealloc_netinfo(cfg, ndev); + wl_dealloc_netinfo(cfg, dev); break; case NETDEV_GOING_DOWN: /* At NETDEV_DOWN state, wdev_cleanup_work work will be called. -- 2.7.4