Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b809739a authored Apr 18, 2006 by YOSHIFUJI Hideaki Committed by David S. Miller Apr 18, 2006

[IPV6]: Clean up hop-by-hop options handler.



- Removed unused argument (nhoff) for ipv6_parse_hopopts().
- Make ipv6_parse_hopopts() to align with other extension header
  handlers.
- Removed pointless assignment (hdr), which is not used afterwards.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e5d25a90

include/net/ipv6.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ extern int ip6_ra_control(struct sock *sk, int sel,
		void (destructor)(struct sock ));


		extern int ipv6_parse_hopopts(struct sk_buff *skb, int);
		extern int ipv6_parse_hopopts(struct sk_buff *skb);

		extern struct ipv6_txoptions * ipv6_dup_options(struct sock sk, struct ipv6_txoptions opt);
		extern struct ipv6_txoptions * ipv6_renew_options(struct sock sk, struct ipv6_txoptions opt,

net/ipv6/exthdrs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ static struct tlvtype_proc tlvprochopopt_lst[] = {
		{ -1, }
		};

		int ipv6_parse_hopopts(struct sk_buff *skb, int nhoff)
		int ipv6_parse_hopopts(struct sk_buff *skb)
		{
		struct inet6_skb_parm *opt = IP6CB(skb);

		@@ -505,7 +505,7 @@ int ipv6_parse_hopopts(struct sk_buff *skb, int nhoff)
		if (ip6_parse_tlv(tlvprochopopt_lst, skb)) {
		skb->h.raw += (skb->h.raw[1]+1)<<3;
		opt->nhoff = sizeof(struct ipv6hdr);
		return sizeof(struct ipv6hdr);
		return 1;
		}
		return -1;
		}

net/ipv6/ip6_input.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -114,11 +114,10 @@ int ipv6_rcv(struct sk_buff skb, struct net_device dev, struct packet_type *pt
		}

		if (hdr->nexthdr == NEXTHDR_HOP) {
		if (ipv6_parse_hopopts(skb, IP6CB(skb)->nhoff) < 0) {
		if (ipv6_parse_hopopts(skb) < 0) {
		IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
		return 0;
		}
		hdr = skb->nh.ipv6h;
		}

		return NF_HOOK(PF_INET6,NF_IP6_PRE_ROUTING, skb, dev, NULL, ip6_rcv_finish);