diff options
-rw-r--r-- | net/wireless/nl80211.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 8c0857815a9..879ca620fd6 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -1516,10 +1516,8 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) | |||
1516 | result = 0; | 1516 | result = 0; |
1517 | 1517 | ||
1518 | mutex_lock(&rdev->mtx); | 1518 | mutex_lock(&rdev->mtx); |
1519 | } else if (nl80211_can_set_dev_channel(netdev->ieee80211_ptr)) | 1519 | } else |
1520 | wdev = netdev->ieee80211_ptr; | 1520 | wdev = netdev->ieee80211_ptr; |
1521 | else | ||
1522 | wdev = NULL; | ||
1523 | 1521 | ||
1524 | /* | 1522 | /* |
1525 | * end workaround code, by now the rdev is available | 1523 | * end workaround code, by now the rdev is available |
@@ -1579,7 +1577,9 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) | |||
1579 | } | 1577 | } |
1580 | 1578 | ||
1581 | if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) { | 1579 | if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) { |
1582 | result = __nl80211_set_channel(rdev, wdev, info); | 1580 | result = __nl80211_set_channel(rdev, |
1581 | nl80211_can_set_dev_channel(wdev) ? wdev : NULL, | ||
1582 | info); | ||
1583 | if (result) | 1583 | if (result) |
1584 | goto bad_res; | 1584 | goto bad_res; |
1585 | } | 1585 | } |