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/ipv4 | |
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/ipv4')
-rw-r--r-- | net/ipv4/igmp.c | 5 | ||||
-rw-r--r-- | net/ipv4/netfilter.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 6110c6d6e613..76c08402c933 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -1899,8 +1899,9 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct | |||
1899 | err = -EADDRNOTAVAIL; | 1899 | err = -EADDRNOTAVAIL; |
1900 | 1900 | ||
1901 | for (pmc=inet->mc_list; pmc; pmc=pmc->next) { | 1901 | for (pmc=inet->mc_list; pmc; pmc=pmc->next) { |
1902 | if (pmc->multi.imr_multiaddr.s_addr == imr.imr_multiaddr.s_addr | 1902 | if ((pmc->multi.imr_multiaddr.s_addr == |
1903 | && pmc->multi.imr_ifindex == imr.imr_ifindex) | 1903 | imr.imr_multiaddr.s_addr) && |
1904 | (pmc->multi.imr_ifindex == imr.imr_ifindex)) | ||
1904 | break; | 1905 | break; |
1905 | } | 1906 | } |
1906 | if (!pmc) { /* must have a prior join */ | 1907 | if (!pmc) { /* must have a prior join */ |
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index 1725dc0ef688..f53cb8df4182 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c | |||
@@ -155,10 +155,10 @@ static int nf_ip_reroute(struct sk_buff *skb, | |||
155 | if (entry->hook == NF_INET_LOCAL_OUT) { | 155 | if (entry->hook == NF_INET_LOCAL_OUT) { |
156 | const struct iphdr *iph = ip_hdr(skb); | 156 | const struct iphdr *iph = ip_hdr(skb); |
157 | 157 | ||
158 | if (!(iph->tos == rt_info->tos | 158 | if (!(iph->tos == rt_info->tos && |
159 | && skb->mark == rt_info->mark | 159 | skb->mark == rt_info->mark && |
160 | && iph->daddr == rt_info->daddr | 160 | iph->daddr == rt_info->daddr && |
161 | && iph->saddr == rt_info->saddr)) | 161 | iph->saddr == rt_info->saddr)) |
162 | return ip_route_me_harder(skb, RTN_UNSPEC); | 162 | return ip_route_me_harder(skb, RTN_UNSPEC); |
163 | } | 163 | } |
164 | return 0; | 164 | return 0; |