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
@@ -60,8 +60,8 @@ static inline unsigned long hold_time(const struct net_bridge *br)
|
||||
static inline int has_expired(const struct net_bridge *br,
|
||||
const struct net_bridge_fdb_entry *fdb)
|
||||
{
|
||||
return !fdb->is_static
|
||||
&& time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);
|
||||
return !fdb->is_static &&
|
||||
time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);
|
||||
}
|
||||
|
||||
static inline int br_mac_hash(const unsigned char *mac)
|
||||
|
@@ -316,9 +316,9 @@ static ssize_t store_group_addr(struct device *d,
|
||||
if (new_addr[5] & ~0xf)
|
||||
return -EINVAL;
|
||||
|
||||
if (new_addr[5] == 1 /* 802.3x Pause address */
|
||||
|| new_addr[5] == 2 /* 802.3ad Slow protocols */
|
||||
|| new_addr[5] == 3) /* 802.1X PAE address */
|
||||
if (new_addr[5] == 1 || /* 802.3x Pause address */
|
||||
new_addr[5] == 2 || /* 802.3ad Slow protocols */
|
||||
new_addr[5] == 3) /* 802.1X PAE address */
|
||||
return -EINVAL;
|
||||
|
||||
spin_lock_bh(&br->lock);
|
||||
|
@@ -135,8 +135,8 @@ ebt_stp_mt(const struct sk_buff *skb, const struct xt_match_param *par)
|
||||
if (memcmp(sp, header, sizeof(header)))
|
||||
return false;
|
||||
|
||||
if (info->bitmask & EBT_STP_TYPE
|
||||
&& FWINV(info->type != sp->type, EBT_STP_TYPE))
|
||||
if (info->bitmask & EBT_STP_TYPE &&
|
||||
FWINV(info->type != sp->type, EBT_STP_TYPE))
|
||||
return false;
|
||||
|
||||
if (sp->type == BPDU_TYPE_CONFIG &&
|
||||
|
Reference in New Issue
Block a user