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

Commit 1de5a71c authored by Eldad Zack's avatar Eldad Zack Committed by David S. Miller
Browse files

ipv6: correct the ipv6 option name - Pad0 to Pad1 

The padding destination or hop-by-hop option is called Pad1 and not Pad0.

See RFC2460 (4.2) or the IANA ipv6-parameters registry:
http://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xml



Signed-off-by: default avatarEldad Zack <eldad@fogrefinery.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 048b899c

include/linux/in6.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ struct in6_flowlabel_req { 
/*

 *	IPv6 TLV options.

 */

#define IPV6_TLV_PAD0		0

#define IPV6_TLV_PAD1		0

#define IPV6_TLV_PADN		1

#define IPV6_TLV_ROUTERALERT	5

#define IPV6_TLV_JUMBO		194

net/bridge/br_multicast.c

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, 
	hopopt[3] = 2;				/* Length of RA Option */

	hopopt[4] = 0;				/* Type = 0x0000 (MLD) */

	hopopt[5] = 0;

	hopopt[6] = IPV6_TLV_PAD0;		/* Pad0 */

	hopopt[7] = IPV6_TLV_PAD0;		/* Pad0 */

	hopopt[6] = IPV6_TLV_PAD1;		/* Pad1 */

	hopopt[7] = IPV6_TLV_PAD1;		/* Pad1 */



	skb_put(skb, sizeof(*ip6h) + 8);

net/bridge/br_netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int check_hbh_len(struct sk_buff *skb) 
		int optlen = nh[off + 1] + 2;



		switch (nh[off]) {

		case IPV6_TLV_PAD0:

		case IPV6_TLV_PAD1:

			optlen = 1;

			break;

net/ipv6/ah6.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr) 


		switch (opt[off]) {



		case IPV6_TLV_PAD0:

		case IPV6_TLV_PAD1:

			optlen = 1;

			break;

		default:
@@ -171,7 +171,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des 


		switch (opt[off]) {



		case IPV6_TLV_PAD0:

		case IPV6_TLV_PAD1:

			optlen = 1;

			break;

		default:

net/ipv6/exthdrs.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int ipv6_find_tlv(struct sk_buff *skb, int offset, int type) 
			return offset;



		switch (opttype) {

		case IPV6_TLV_PAD0:

		case IPV6_TLV_PAD1:

			optlen = 1;

			break;

		default:
@@ -156,7 +156,7 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff *skb) 
		int i;



		switch (nh[off]) {

		case IPV6_TLV_PAD0:

		case IPV6_TLV_PAD1:

			optlen = 1;

			break;