diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-06-24 19:44:33 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-28 15:16:20 -0400 |
| commit | 38bdb650f902d275d6b2f9c2d8247fd960525583 (patch) | |
| tree | e764243fd86df22e33bff2228d70c6e5ccd8008b | |
| parent | 78c4653a2274479547e259e1f416d2b3d04c42a8 (diff) | |
mac80211: fix the for_each_sta_info macro
Because of an ambiguity in the for_each_sta_info macro, it can
currently only be used if the third parameter is set to 'sta'.
Fix this by renaming the parameter to '_sta'.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/sta_info.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 10d0fcb417ae..54262e72376d 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
| @@ -427,20 +427,20 @@ void for_each_sta_info_type_check(struct ieee80211_local *local, | |||
| 427 | { | 427 | { |
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | #define for_each_sta_info(local, _addr, sta, nxt) \ | 430 | #define for_each_sta_info(local, _addr, _sta, nxt) \ |
| 431 | for ( /* initialise loop */ \ | 431 | for ( /* initialise loop */ \ |
| 432 | sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\ | 432 | _sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\ |
| 433 | nxt = sta ? rcu_dereference(sta->hnext) : NULL; \ | 433 | nxt = _sta ? rcu_dereference(_sta->hnext) : NULL; \ |
| 434 | /* typecheck */ \ | 434 | /* typecheck */ \ |
| 435 | for_each_sta_info_type_check(local, (_addr), sta, nxt), \ | 435 | for_each_sta_info_type_check(local, (_addr), _sta, nxt),\ |
| 436 | /* continue condition */ \ | 436 | /* continue condition */ \ |
| 437 | sta; \ | 437 | _sta; \ |
| 438 | /* advance loop */ \ | 438 | /* advance loop */ \ |
| 439 | sta = nxt, \ | 439 | _sta = nxt, \ |
| 440 | nxt = sta ? rcu_dereference(sta->hnext) : NULL \ | 440 | nxt = _sta ? rcu_dereference(_sta->hnext) : NULL \ |
| 441 | ) \ | 441 | ) \ |
| 442 | /* compare address and run code only if it matches */ \ | 442 | /* compare address and run code only if it matches */ \ |
| 443 | if (memcmp(sta->sta.addr, (_addr), ETH_ALEN) == 0) | 443 | if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0) |
| 444 | 444 | ||
| 445 | /* | 445 | /* |
| 446 | * Get STA info by index, BROKEN! | 446 | * Get STA info by index, BROKEN! |