diff options
Diffstat (limited to 'net/ipv6/exthdrs.c')
-rw-r--r-- | net/ipv6/exthdrs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 0711f92d6a12..08313efc48c8 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c | |||
@@ -16,7 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | /* Changes: | 18 | /* Changes: |
19 | * yoshfuji : ensure not to overrun while parsing | 19 | * yoshfuji : ensure not to overrun while parsing |
20 | * tlv options. | 20 | * tlv options. |
21 | * Mitsuru KANDA @USAGI and: Remove ipv6_parse_exthdrs(). | 21 | * Mitsuru KANDA @USAGI and: Remove ipv6_parse_exthdrs(). |
22 | * YOSHIFUJI Hideaki @USAGI Register inbound extension header | 22 | * YOSHIFUJI Hideaki @USAGI Register inbound extension header |
@@ -167,8 +167,8 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff **skbp) | |||
167 | goto bad; | 167 | goto bad; |
168 | for (curr=procs; curr->type >= 0; curr++) { | 168 | for (curr=procs; curr->type >= 0; curr++) { |
169 | if (curr->type == skb->nh.raw[off]) { | 169 | if (curr->type == skb->nh.raw[off]) { |
170 | /* type specific length/alignment | 170 | /* type specific length/alignment |
171 | checks will be performed in the | 171 | checks will be performed in the |
172 | func(). */ | 172 | func(). */ |
173 | if (curr->func(skbp, off) == 0) | 173 | if (curr->func(skbp, off) == 0) |
174 | return 0; | 174 | return 0; |
@@ -572,7 +572,7 @@ void __init ipv6_rthdr_init(void) | |||
572 | For now we need to test the engine, so that I created | 572 | For now we need to test the engine, so that I created |
573 | temporary (or permanent) backdoor. | 573 | temporary (or permanent) backdoor. |
574 | If listening socket set IPV6_RTHDR to 2, then we invert header. | 574 | If listening socket set IPV6_RTHDR to 2, then we invert header. |
575 | --ANK (980729) | 575 | --ANK (980729) |
576 | */ | 576 | */ |
577 | 577 | ||
578 | struct ipv6_txoptions * | 578 | struct ipv6_txoptions * |
@@ -635,7 +635,7 @@ static int ipv6_hop_ra(struct sk_buff **skbp, int optoff) | |||
635 | return 1; | 635 | return 1; |
636 | } | 636 | } |
637 | LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_ra: wrong RA length %d\n", | 637 | LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_ra: wrong RA length %d\n", |
638 | skb->nh.raw[optoff+1]); | 638 | skb->nh.raw[optoff+1]); |
639 | kfree_skb(skb); | 639 | kfree_skb(skb); |
640 | return 0; | 640 | return 0; |
641 | } | 641 | } |
@@ -649,7 +649,7 @@ static int ipv6_hop_jumbo(struct sk_buff **skbp, int optoff) | |||
649 | 649 | ||
650 | if (skb->nh.raw[optoff+1] != 4 || (optoff&3) != 2) { | 650 | if (skb->nh.raw[optoff+1] != 4 || (optoff&3) != 2) { |
651 | LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n", | 651 | LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n", |
652 | skb->nh.raw[optoff+1]); | 652 | skb->nh.raw[optoff+1]); |
653 | IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), | 653 | IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), |
654 | IPSTATS_MIB_INHDRERRORS); | 654 | IPSTATS_MIB_INHDRERRORS); |
655 | goto drop; | 655 | goto drop; |
@@ -740,7 +740,7 @@ static void ipv6_push_rthdr(struct sk_buff *skb, u8 *proto, | |||
740 | int hops; | 740 | int hops; |
741 | 741 | ||
742 | ihdr = (struct rt0_hdr *) opt; | 742 | ihdr = (struct rt0_hdr *) opt; |
743 | 743 | ||
744 | phdr = (struct rt0_hdr *) skb_push(skb, (ihdr->rt_hdr.hdrlen + 1) << 3); | 744 | phdr = (struct rt0_hdr *) skb_push(skb, (ihdr->rt_hdr.hdrlen + 1) << 3); |
745 | memcpy(phdr, ihdr, sizeof(struct rt0_hdr)); | 745 | memcpy(phdr, ihdr, sizeof(struct rt0_hdr)); |
746 | 746 | ||