Commit a4956dca authored by Luca Coelho's avatar Luca Coelho Committed by Johannes Berg

cfg80211: make rdev assignment clearer in nl80211_testmode_dump()

Avoid assigning rdev to NULL when we already have it and getting it
again from the wiphy index, by moving this code to relevant if block.
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent b2347a32
...@@ -8585,6 +8585,12 @@ static int nl80211_testmode_dump(struct sk_buff *skb, ...@@ -8585,6 +8585,12 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
* so we need to offset by 1. * so we need to offset by 1.
*/ */
phy_idx = cb->args[0] - 1; phy_idx = cb->args[0] - 1;
rdev = cfg80211_rdev_by_wiphy_idx(phy_idx);
if (!rdev) {
err = -ENOENT;
goto out_err;
}
} else { } else {
struct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam); struct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);
...@@ -8599,7 +8605,6 @@ static int nl80211_testmode_dump(struct sk_buff *skb, ...@@ -8599,7 +8605,6 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
goto out_err; goto out_err;
} }
phy_idx = rdev->wiphy_idx; phy_idx = rdev->wiphy_idx;
rdev = NULL;
if (attrbuf[NL80211_ATTR_TESTDATA]) if (attrbuf[NL80211_ATTR_TESTDATA])
cb->args[1] = (long)attrbuf[NL80211_ATTR_TESTDATA]; cb->args[1] = (long)attrbuf[NL80211_ATTR_TESTDATA];
...@@ -8610,12 +8615,6 @@ static int nl80211_testmode_dump(struct sk_buff *skb, ...@@ -8610,12 +8615,6 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
data_len = nla_len((void *)cb->args[1]); data_len = nla_len((void *)cb->args[1]);
} }
rdev = cfg80211_rdev_by_wiphy_idx(phy_idx);
if (!rdev) {
err = -ENOENT;
goto out_err;
}
if (!rdev->ops->testmode_dump) { if (!rdev->ops->testmode_dump) {
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
goto out_err; goto out_err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment