diff options
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 5 | ||||
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 672459b..4f9f216 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -775,10 +775,9 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev, } static int cfg80211_netdev_notifier_call(struct notifier_block *nb, - unsigned long state, - void *ndev) + unsigned long state, void *ptr) { - struct net_device *dev = ndev; + struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_registered_device *rdev; int ret; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 7dc3343..1cc47ac 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1568,8 +1568,10 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) rtnl_lock(); if (!state) { state = kzalloc(sizeof(*state), GFP_KERNEL); - if (!state) + if (!state) { + rtnl_unlock(); return -ENOMEM; + } state->filter_wiphy = -1; ret = nl80211_dump_wiphy_parse(skb, cb, state); if (ret) { |