diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-06-04 07:40:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 14:59:34 -0400 |
commit | 56e8256351c358d7a2003f6fe10dcb5e2bc394f7 (patch) | |
tree | 56d429e3816a0f31c269bcc840dd8f70de36e0d3 | |
parent | 15d6c07929a2efa8802b5cc9bb8c91bdf5ba219b (diff) |
rt2x00: rt2x00dev: use rt2x00dev->bcn->limit
The beacon data queue is initialized already,
so fetch the number of the queue entries from
that instead of using the entry_num field of
the data queue descriptor.
The two values are the same, and the use of the
rt2x00dev->bcn->limit value allows us to get rid
of a superfluous pointer dereference.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 6a201725bc50..dff5012f0548 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -1336,7 +1336,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) | |||
1336 | * beacon entries. | 1336 | * beacon entries. |
1337 | */ | 1337 | */ |
1338 | rt2x00dev->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); | 1338 | rt2x00dev->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); |
1339 | if (rt2x00dev->ops->bcn->entry_num > 0) | 1339 | if (rt2x00dev->bcn->limit > 0) |
1340 | rt2x00dev->hw->wiphy->interface_modes |= | 1340 | rt2x00dev->hw->wiphy->interface_modes |= |
1341 | BIT(NL80211_IFTYPE_ADHOC) | | 1341 | BIT(NL80211_IFTYPE_ADHOC) | |
1342 | BIT(NL80211_IFTYPE_AP) | | 1342 | BIT(NL80211_IFTYPE_AP) | |