tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eldad Zack and committed by
David S. Miller 1de5a71c 048b899c

+10 -10
+1 -1
include/linux/in6.h
··· 142 142 /* 143 143 * IPv6 TLV options. 144 144 */ 145 - #define IPV6_TLV_PAD0 0 145 + #define IPV6_TLV_PAD1 0 146 146 #define IPV6_TLV_PADN 1 147 147 #define IPV6_TLV_ROUTERALERT 5 148 148 #define IPV6_TLV_JUMBO 194
+2 -2
net/bridge/br_multicast.c
··· 460 460 hopopt[3] = 2; /* Length of RA Option */ 461 461 hopopt[4] = 0; /* Type = 0x0000 (MLD) */ 462 462 hopopt[5] = 0; 463 - hopopt[6] = IPV6_TLV_PAD0; /* Pad0 */ 464 - hopopt[7] = IPV6_TLV_PAD0; /* Pad0 */ 463 + hopopt[6] = IPV6_TLV_PAD1; /* Pad1 */ 464 + hopopt[7] = IPV6_TLV_PAD1; /* Pad1 */ 465 465 466 466 skb_put(skb, sizeof(*ip6h) + 8); 467 467
+1 -1
net/bridge/br_netfilter.c
··· 558 558 int optlen = nh[off + 1] + 2; 559 559 560 560 switch (nh[off]) { 561 - case IPV6_TLV_PAD0: 561 + case IPV6_TLV_PAD1: 562 562 optlen = 1; 563 563 break; 564 564
+2 -2
net/ipv6/ah6.c
··· 127 127 128 128 switch (opt[off]) { 129 129 130 - case IPV6_TLV_PAD0: 130 + case IPV6_TLV_PAD1: 131 131 optlen = 1; 132 132 break; 133 133 default: ··· 171 171 172 172 switch (opt[off]) { 173 173 174 - case IPV6_TLV_PAD0: 174 + case IPV6_TLV_PAD1: 175 175 optlen = 1; 176 176 break; 177 177 default:
+2 -2
net/ipv6/exthdrs.c
··· 75 75 return offset; 76 76 77 77 switch (opttype) { 78 - case IPV6_TLV_PAD0: 78 + case IPV6_TLV_PAD1: 79 79 optlen = 1; 80 80 break; 81 81 default: ··· 156 156 int i; 157 157 158 158 switch (nh[off]) { 159 - case IPV6_TLV_PAD0: 159 + case IPV6_TLV_PAD1: 160 160 optlen = 1; 161 161 break; 162 162
+1 -1
net/ipv6/mip6.c
··· 46 46 if (!data) 47 47 return NULL; 48 48 if (padlen == 1) { 49 - data[0] = IPV6_TLV_PAD0; 49 + data[0] = IPV6_TLV_PAD1; 50 50 } else if (padlen > 1) { 51 51 data[0] = IPV6_TLV_PADN; 52 52 data[1] = padlen - 2;
+1 -1
net/sched/act_csum.c
··· 397 397 398 398 while (len > 1) { 399 399 switch (xh[off]) { 400 - case IPV6_TLV_PAD0: 400 + case IPV6_TLV_PAD1: 401 401 optlen = 1; 402 402 break; 403 403 case IPV6_TLV_JUMBO: