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/wireless/scan.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/wireless/scan.c')
-rw-r--r-- | net/wireless/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 227d57b8dc41..96df34c3c6ee 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
@@ -937,8 +937,8 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info, | |||
937 | ie += ie[1] + 2; | 937 | ie += ie[1] + 2; |
938 | } | 938 | } |
939 | 939 | ||
940 | if (bss->pub.capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS) | 940 | if (bss->pub.capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS) || |
941 | || ismesh) { | 941 | ismesh) { |
942 | memset(&iwe, 0, sizeof(iwe)); | 942 | memset(&iwe, 0, sizeof(iwe)); |
943 | iwe.cmd = SIOCGIWMODE; | 943 | iwe.cmd = SIOCGIWMODE; |
944 | if (ismesh) | 944 | if (ismesh) |