diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/mac80211/tx.c | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 943def2b07df..8834cc93c716 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -366,10 +366,11 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) | |||
366 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data; | 366 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data; |
367 | u32 staflags; | 367 | u32 staflags; |
368 | 368 | ||
369 | if (unlikely(!sta || ieee80211_is_probe_resp(hdr->frame_control) | 369 | if (unlikely(!sta || |
370 | || ieee80211_is_auth(hdr->frame_control) | 370 | ieee80211_is_probe_resp(hdr->frame_control) || |
371 | || ieee80211_is_assoc_resp(hdr->frame_control) | 371 | ieee80211_is_auth(hdr->frame_control) || |
372 | || ieee80211_is_reassoc_resp(hdr->frame_control))) | 372 | ieee80211_is_assoc_resp(hdr->frame_control) || |
373 | ieee80211_is_reassoc_resp(hdr->frame_control))) | ||
373 | return TX_CONTINUE; | 374 | return TX_CONTINUE; |
374 | 375 | ||
375 | staflags = get_sta_flags(sta); | 376 | staflags = get_sta_flags(sta); |