nl80211: remove nl80211_prepare_wdev_dump() skb argument

nl80211_prepare_wdev_dump() is using the output skb to look up
the network namespace, but this isn't really necessary, it can
just as well use the input skb which is available as cb->skb,
the sk is the same anyway.

Therefore, remove the redundant argument.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 235a43185e8d7d2db0807cf084560fe76aabd6c2..8f962c79987ae8956ee3cd9868b19ceb90334833 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -581,8 +581,7 @@ nl80211_packet_pattern_policy[MAX_NL80211_PKTPAT + 1] = {
        [NL80211_PKTPAT_OFFSET] = { .type = NLA_U32 },
 };
 
-static int nl80211_prepare_wdev_dump(struct sk_buff *skb,
-                                    struct netlink_callback *cb,
+static int nl80211_prepare_wdev_dump(struct netlink_callback *cb,
                                     struct cfg80211_registered_device **rdev,
                                     struct wireless_dev **wdev)
 {
@@ -596,7 +595,7 @@ static int nl80211_prepare_wdev_dump(struct sk_buff *skb,
                        return err;
 
                *wdev = __cfg80211_wdev_from_attrs(
-                                       sock_net(skb->sk),
+                                       sock_net(cb->skb->sk),
                                        genl_family_attrbuf(&nl80211_fam));
                if (IS_ERR(*wdev))
                        return PTR_ERR(*wdev);
@@ -4847,7 +4846,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
        int err;
 
        rtnl_lock();
-       err = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);
+       err = nl80211_prepare_wdev_dump(cb, &rdev, &wdev);
        if (err)
                goto out_err;
 
@@ -5698,7 +5697,7 @@ static int nl80211_dump_mpath(struct sk_buff *skb,
        int err;
 
        rtnl_lock();
-       err = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);
+       err = nl80211_prepare_wdev_dump(cb, &rdev, &wdev);
        if (err)
                goto out_err;
 
@@ -5894,7 +5893,7 @@ static int nl80211_dump_mpp(struct sk_buff *skb,
        int err;
 
        rtnl_lock();
-       err = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);
+       err = nl80211_prepare_wdev_dump(cb, &rdev, &wdev);
        if (err)
                goto out_err;
 
@@ -8227,7 +8226,7 @@ static int nl80211_dump_scan(struct sk_buff *skb, struct netlink_callback *cb)
        int err;
 
        rtnl_lock();
-       err = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);
+       err = nl80211_prepare_wdev_dump(cb, &rdev, &wdev);
        if (err) {
                rtnl_unlock();
                return err;
@@ -8348,7 +8347,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
        bool radio_stats;
 
        rtnl_lock();
-       res = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);
+       res = nl80211_prepare_wdev_dump(cb, &rdev, &wdev);
        if (res)
                goto out_err;