aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 7b7bd44fbf47..305516921aa8 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1,9 +1,9 @@
1/* 1/*
2 * IPv6 output functions 2 * IPv6 output functions
3 * Linux INET6 implementation 3 * Linux INET6 implementation
4 * 4 *
5 * Authors: 5 * Authors:
6 * Pedro Roque <roque@di.fc.ul.pt> 6 * Pedro Roque <roque@di.fc.ul.pt>
7 * 7 *
8 * $Id: ip6_output.c,v 1.34 2002/02/01 22:01:04 davem Exp $ 8 * $Id: ip6_output.c,v 1.34 2002/02/01 22:01:04 davem Exp $
9 * 9 *
@@ -363,7 +363,7 @@ int ip6_forward(struct sk_buff *skb)
363 struct dst_entry *dst = skb->dst; 363 struct dst_entry *dst = skb->dst;
364 struct ipv6hdr *hdr = skb->nh.ipv6h; 364 struct ipv6hdr *hdr = skb->nh.ipv6h;
365 struct inet6_skb_parm *opt = IP6CB(skb); 365 struct inet6_skb_parm *opt = IP6CB(skb);
366 366
367 if (ipv6_devconf.forwarding == 0) 367 if (ipv6_devconf.forwarding == 0)
368 goto error; 368 goto error;
369 369
@@ -473,7 +473,7 @@ int ip6_forward(struct sk_buff *skb)
473 hdr = skb->nh.ipv6h; 473 hdr = skb->nh.ipv6h;
474 474
475 /* Mangling hops number delayed to point after skb COW */ 475 /* Mangling hops number delayed to point after skb COW */
476 476
477 hdr->hop_limit--; 477 hdr->hop_limit--;
478 478
479 IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS); 479 IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);
@@ -659,7 +659,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
659 frag->nh.ipv6h->payload_len = htons(frag->len - sizeof(struct ipv6hdr)); 659 frag->nh.ipv6h->payload_len = htons(frag->len - sizeof(struct ipv6hdr));
660 ip6_copy_metadata(frag, skb); 660 ip6_copy_metadata(frag, skb);
661 } 661 }
662 662
663 err = output(skb); 663 err = output(skb);
664 if(!err) 664 if(!err)
665 IP6_INC_STATS(ip6_dst_idev(&rt->u.dst), IPSTATS_MIB_FRAGCREATES); 665 IP6_INC_STATS(ip6_dst_idev(&rt->u.dst), IPSTATS_MIB_FRAGCREATES);
@@ -792,7 +792,7 @@ slow_path:
792fail: 792fail:
793 IP6_INC_STATS(ip6_dst_idev(skb->dst), 793 IP6_INC_STATS(ip6_dst_idev(skb->dst),
794 IPSTATS_MIB_FRAGFAILS); 794 IPSTATS_MIB_FRAGFAILS);
795 kfree_skb(skb); 795 kfree_skb(skb);
796 return err; 796 return err;
797} 797}
798 798
@@ -955,7 +955,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,
955 struct frag_hdr fhdr; 955 struct frag_hdr fhdr;
956 956
957 /* specify the length of each IP datagram fragment*/ 957 /* specify the length of each IP datagram fragment*/
958 skb_shinfo(skb)->gso_size = mtu - fragheaderlen - 958 skb_shinfo(skb)->gso_size = mtu - fragheaderlen -
959 sizeof(struct frag_hdr); 959 sizeof(struct frag_hdr);
960 skb_shinfo(skb)->gso_type = SKB_GSO_UDP; 960 skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
961 ipv6_select_ident(skb, &fhdr); 961 ipv6_select_ident(skb, &fhdr);
@@ -1058,13 +1058,13 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
1058 * fragment alignment (= 8-15 octects, in total). 1058 * fragment alignment (= 8-15 octects, in total).
1059 * 1059 *
1060 * Note that we may need to "move" the data from the tail of 1060 * Note that we may need to "move" the data from the tail of
1061 * of the buffer to the new fragment when we split 1061 * of the buffer to the new fragment when we split
1062 * the message. 1062 * the message.
1063 * 1063 *
1064 * FIXME: It may be fragmented into multiple chunks 1064 * FIXME: It may be fragmented into multiple chunks
1065 * at once if non-fragmentable extension headers 1065 * at once if non-fragmentable extension headers
1066 * are too large. 1066 * are too large.
1067 * --yoshfuji 1067 * --yoshfuji
1068 */ 1068 */
1069 1069
1070 inet->cork.length += length; 1070 inet->cork.length += length;
@@ -1129,7 +1129,7 @@ alloc_new_skb:
1129 1129
1130 /* 1130 /*
1131 * We just reserve space for fragment header. 1131 * We just reserve space for fragment header.
1132 * Note: this may be overallocation if the message 1132 * Note: this may be overallocation if the message
1133 * (without MSG_MORE) fits into the MTU. 1133 * (without MSG_MORE) fits into the MTU.
1134 */ 1134 */
1135 alloclen += sizeof(struct frag_hdr); 1135 alloclen += sizeof(struct frag_hdr);
@@ -1310,7 +1310,7 @@ int ip6_push_pending_frames(struct sock *sk)
1310 ipv6_push_nfrag_opts(skb, opt, &proto, &final_dst); 1310 ipv6_push_nfrag_opts(skb, opt, &proto, &final_dst);
1311 1311
1312 skb->nh.ipv6h = hdr = (struct ipv6hdr*) skb_push(skb, sizeof(struct ipv6hdr)); 1312 skb->nh.ipv6h = hdr = (struct ipv6hdr*) skb_push(skb, sizeof(struct ipv6hdr));
1313 1313
1314 *(__be32*)hdr = fl->fl6_flowlabel | 1314 *(__be32*)hdr = fl->fl6_flowlabel |
1315 htonl(0x60000000 | ((int)np->cork.tclass << 20)); 1315 htonl(0x60000000 | ((int)np->cork.tclass << 20));
1316 1316