Message ID | 1387352656-860-6-git-send-email-chenweilong@huawei.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 2013-12-18 at 15:44 +0800, Chen Weilong wrote: > #define for_each_sta_info(local, _addr, _sta, nxt) \ > - for ( /* initialise loop */ \ > + for (/* initialise loop */ \ > _sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\ > nxt = _sta ? rcu_dereference(_sta->hnext) : NULL; \ > /* typecheck */ \ I've applied it all (I squashed it though, no sense in having 5 small commits that look identical on first glance), except for this bit - the code here is aligned that way on purpose. johannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 4096ff6..1c47bf4 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -63,7 +63,7 @@ #define CCK_DURATION(_bitrate, _short, _len) \ (1000 * (10 /* SIFS */ + \ - (_short ? 72 + 24 : 144 + 48 ) + \ + (_short ? 72 + 24 : 144 + 48) + \ (8 * (_len + 4) * 10) / (_bitrate))) #define CCK_ACK_DURATION(_bitrate, _short) \ diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 3ef06a2..698eca7 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -528,7 +528,7 @@ void for_each_sta_info_type_check(struct ieee80211_local *local, } #define for_each_sta_info(local, _addr, _sta, nxt) \ - for ( /* initialise loop */ \ + for (/* initialise loop */ \ _sta = rcu_dereference(local->sta_hash[STA_HASH(_addr)]),\ nxt = _sta ? rcu_dereference(_sta->hnext) : NULL; \ /* typecheck */ \