aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv6/udp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 733371689795..87b06a80102b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -93,10 +93,10 @@ static struct sock *__udp6_lib_lookup(struct in6_addr *saddr, __be16 sport,
93 continue; 93 continue;
94 score++; 94 score++;
95 } 95 }
96 if(score == 4) { 96 if (score == 4) {
97 result = sk; 97 result = sk;
98 break; 98 break;
99 } else if(score > badness) { 99 } else if (score > badness) {
100 result = sk; 100 result = sk;
101 badness = score; 101 badness = score;
102 } 102 }
@@ -329,7 +329,7 @@ static struct sock *udp_v6_mcast_next(struct sock *sk,
329 if (!ipv6_addr_equal(&np->rcv_saddr, loc_addr)) 329 if (!ipv6_addr_equal(&np->rcv_saddr, loc_addr))
330 continue; 330 continue;
331 } 331 }
332 if(!inet6_mc_check(s, loc_addr, rmt_addr)) 332 if (!inet6_mc_check(s, loc_addr, rmt_addr))
333 continue; 333 continue;
334 return s; 334 return s;
335 } 335 }
@@ -473,14 +473,14 @@ int __udp6_lib_rcv(struct sk_buff **pskb, struct hlist_head udptable[],
473 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 473 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
474 474
475 kfree_skb(skb); 475 kfree_skb(skb);
476 return(0); 476 return 0;
477 } 477 }
478 478
479 /* deliver */ 479 /* deliver */
480 480
481 udpv6_queue_rcv_skb(sk, skb); 481 udpv6_queue_rcv_skb(sk, skb);
482 sock_put(sk); 482 sock_put(sk);
483 return(0); 483 return 0;
484 484
485short_packet: 485short_packet:
486 LIMIT_NETDEBUG(KERN_DEBUG "UDP%sv6: short packet: %d/%u\n", 486 LIMIT_NETDEBUG(KERN_DEBUG "UDP%sv6: short packet: %d/%u\n",
@@ -490,7 +490,7 @@ short_packet:
490discard: 490discard:
491 UDP6_INC_STATS_BH(UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE); 491 UDP6_INC_STATS_BH(UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);
492 kfree_skb(skb); 492 kfree_skb(skb);
493 return(0); 493 return 0;
494} 494}
495 495
496static __inline__ int udpv6_rcv(struct sk_buff **pskb) 496static __inline__ int udpv6_rcv(struct sk_buff **pskb)