diff options
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 25ffe737b975..12fcce8fba46 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -373,8 +373,8 @@ EXPORT_SYMBOL_GPL(udp6_lib_lookup); | |||
373 | 373 | ||
374 | 374 | ||
375 | /* | 375 | /* |
376 | * This should be easy, if there is something there we | 376 | * This should be easy, if there is something there we |
377 | * return it, otherwise we block. | 377 | * return it, otherwise we block. |
378 | */ | 378 | */ |
379 | 379 | ||
380 | int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, | 380 | int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, |
@@ -530,7 +530,7 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
530 | const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data; | 530 | const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data; |
531 | const struct in6_addr *saddr = &hdr->saddr; | 531 | const struct in6_addr *saddr = &hdr->saddr; |
532 | const struct in6_addr *daddr = &hdr->daddr; | 532 | const struct in6_addr *daddr = &hdr->daddr; |
533 | struct udphdr *uh = (struct udphdr*)(skb->data+offset); | 533 | struct udphdr *uh = (struct udphdr *)(skb->data+offset); |
534 | struct sock *sk; | 534 | struct sock *sk; |
535 | int err; | 535 | int err; |
536 | struct net *net = dev_net(skb->dev); | 536 | struct net *net = dev_net(skb->dev); |
@@ -596,7 +596,7 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) | |||
596 | 596 | ||
597 | static __inline__ void udpv6_err(struct sk_buff *skb, | 597 | static __inline__ void udpv6_err(struct sk_buff *skb, |
598 | struct inet6_skb_parm *opt, u8 type, | 598 | struct inet6_skb_parm *opt, u8 type, |
599 | u8 code, int offset, __be32 info ) | 599 | u8 code, int offset, __be32 info) |
600 | { | 600 | { |
601 | __udp6_lib_err(skb, opt, type, code, offset, info, &udp_table); | 601 | __udp6_lib_err(skb, opt, type, code, offset, info, &udp_table); |
602 | } | 602 | } |
@@ -960,10 +960,10 @@ static void udp_v6_flush_pending_frames(struct sock *sk) | |||
960 | } | 960 | } |
961 | 961 | ||
962 | /** | 962 | /** |
963 | * udp6_hwcsum_outgoing - handle outgoing HW checksumming | 963 | * udp6_hwcsum_outgoing - handle outgoing HW checksumming |
964 | * @sk: socket we are sending on | 964 | * @sk: socket we are sending on |
965 | * @skb: sk_buff containing the filled-in UDP header | 965 | * @skb: sk_buff containing the filled-in UDP header |
966 | * (checksum field must be zeroed out) | 966 | * (checksum field must be zeroed out) |
967 | */ | 967 | */ |
968 | static void udp6_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb, | 968 | static void udp6_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb, |
969 | const struct in6_addr *saddr, | 969 | const struct in6_addr *saddr, |
@@ -1294,7 +1294,7 @@ do_append_data: | |||
1294 | getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; | 1294 | getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; |
1295 | err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen, | 1295 | err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen, |
1296 | sizeof(struct udphdr), hlimit, tclass, opt, &fl6, | 1296 | sizeof(struct udphdr), hlimit, tclass, opt, &fl6, |
1297 | (struct rt6_info*)dst, | 1297 | (struct rt6_info *)dst, |
1298 | corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag); | 1298 | corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag); |
1299 | if (err) | 1299 | if (err) |
1300 | udp_v6_flush_pending_frames(sk); | 1300 | udp_v6_flush_pending_frames(sk); |