Resolve merge conflict

c1d630b5 · Linus Torvalds · 44879cd0 · c3a12cc5 · c1d630b5 · c1d630b5
Commit c1d630b5 authored Mar 12, 2002 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 272 additions and 328 deletions

net/ipv4/ipmr.c net/ipv4/ipmr.c +1 -2

net/ipx/af_spx.c net/ipx/af_spx.c +271 -326

No files found.
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -855,8 +855,7 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char *optval,int optlen)
 	switch(optname)
 	{
 		case MRT_INIT:
-			if(sk->type!=SOCK_RAW ||
-			   inet_sk(sk)->num!=IPPROTO_IGMP)
+			if(sk->type!=SOCK_RAW || inet_sk(sk)->num!=IPPROTO_IGMP)
 				return -EOPNOTSUPP;
 			if(optlen!=sizeof(int))
 				return -ENOPROTOOPT;

--- a/net/ipx/af_spx.c
+++ b/net/ipx/af_spx.c