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:

کامیت شده توسط
David S. Miller

والد
152b6a62ae
کامیت
f64f9e7192
@@ -1899,8 +1899,9 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
|
||||
err = -EADDRNOTAVAIL;
|
||||
|
||||
for (pmc=inet->mc_list; pmc; pmc=pmc->next) {
|
||||
if (pmc->multi.imr_multiaddr.s_addr == imr.imr_multiaddr.s_addr
|
||||
&& pmc->multi.imr_ifindex == imr.imr_ifindex)
|
||||
if ((pmc->multi.imr_multiaddr.s_addr ==
|
||||
imr.imr_multiaddr.s_addr) &&
|
||||
(pmc->multi.imr_ifindex == imr.imr_ifindex))
|
||||
break;
|
||||
}
|
||||
if (!pmc) { /* must have a prior join */
|
||||
|
@@ -155,10 +155,10 @@ static int nf_ip_reroute(struct sk_buff *skb,
|
||||
if (entry->hook == NF_INET_LOCAL_OUT) {
|
||||
const struct iphdr *iph = ip_hdr(skb);
|
||||
|
||||
if (!(iph->tos == rt_info->tos
|
||||
&& skb->mark == rt_info->mark
|
||||
&& iph->daddr == rt_info->daddr
|
||||
&& iph->saddr == rt_info->saddr))
|
||||
if (!(iph->tos == rt_info->tos &&
|
||||
skb->mark == rt_info->mark &&
|
||||
iph->daddr == rt_info->daddr &&
|
||||
iph->saddr == rt_info->saddr))
|
||||
return ip_route_me_harder(skb, RTN_UNSPEC);
|
||||
}
|
||||
return 0;
|
||||
|
مرجع در شماره جدید
Block a user