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/rx.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/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 96f13ad05d3c..beecf50fbd10 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1168,8 +1168,8 @@ ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) | |||
1168 | rx->key)) | 1168 | rx->key)) |
1169 | return -EACCES; | 1169 | return -EACCES; |
1170 | /* BIP does not use Protected field, so need to check MMIE */ | 1170 | /* BIP does not use Protected field, so need to check MMIE */ |
1171 | if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) | 1171 | if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) && |
1172 | && ieee80211_get_mmie_keyidx(rx->skb) < 0 && | 1172 | ieee80211_get_mmie_keyidx(rx->skb) < 0 && |
1173 | rx->key)) | 1173 | rx->key)) |
1174 | return -EACCES; | 1174 | return -EACCES; |
1175 | /* | 1175 | /* |