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>
This commit is contained in:

committed by
David S. Miller

parent
152b6a62ae
commit
f64f9e7192
@@ -937,8 +937,8 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info,
|
||||
ie += ie[1] + 2;
|
||||
}
|
||||
|
||||
if (bss->pub.capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)
|
||||
|| ismesh) {
|
||||
if (bss->pub.capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS) ||
|
||||
ismesh) {
|
||||
memset(&iwe, 0, sizeof(iwe));
|
||||
iwe.cmd = SIOCGIWMODE;
|
||||
if (ismesh)
|
||||
|
@@ -911,8 +911,9 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
|
||||
*/
|
||||
static int wext_permission_check(unsigned int cmd)
|
||||
{
|
||||
if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT)
|
||||
&& !capable(CAP_NET_ADMIN))
|
||||
if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE ||
|
||||
cmd == SIOCGIWENCODEEXT) &&
|
||||
!capable(CAP_NET_ADMIN))
|
||||
return -EPERM;
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user