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

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.xmlSigned-off-by: default avatarEldad Zack <eldad@fogrefinery.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 048b899c
...@@ -142,7 +142,7 @@ struct in6_flowlabel_req { ...@@ -142,7 +142,7 @@ struct in6_flowlabel_req {
/* /*
* IPv6 TLV options. * IPv6 TLV options.
*/ */
#define IPV6_TLV_PAD0 0 #define IPV6_TLV_PAD1 0
#define IPV6_TLV_PADN 1 #define IPV6_TLV_PADN 1
#define IPV6_TLV_ROUTERALERT 5 #define IPV6_TLV_ROUTERALERT 5
#define IPV6_TLV_JUMBO 194 #define IPV6_TLV_JUMBO 194
......
...@@ -460,8 +460,8 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, ...@@ -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[3] = 2; /* Length of RA Option */
hopopt[4] = 0; /* Type = 0x0000 (MLD) */ hopopt[4] = 0; /* Type = 0x0000 (MLD) */
hopopt[5] = 0; hopopt[5] = 0;
hopopt[6] = IPV6_TLV_PAD0; /* Pad0 */ hopopt[6] = IPV6_TLV_PAD1; /* Pad1 */
hopopt[7] = IPV6_TLV_PAD0; /* Pad0 */ hopopt[7] = IPV6_TLV_PAD1; /* Pad1 */
skb_put(skb, sizeof(*ip6h) + 8); skb_put(skb, sizeof(*ip6h) + 8);
......
...@@ -558,7 +558,7 @@ static int check_hbh_len(struct sk_buff *skb) ...@@ -558,7 +558,7 @@ static int check_hbh_len(struct sk_buff *skb)
int optlen = nh[off + 1] + 2; int optlen = nh[off + 1] + 2;
switch (nh[off]) { switch (nh[off]) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD1:
optlen = 1; optlen = 1;
break; break;
......
...@@ -127,7 +127,7 @@ static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr) ...@@ -127,7 +127,7 @@ static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
switch (opt[off]) { switch (opt[off]) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD1:
optlen = 1; optlen = 1;
break; break;
default: default:
...@@ -171,7 +171,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des ...@@ -171,7 +171,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des
switch (opt[off]) { switch (opt[off]) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD1:
optlen = 1; optlen = 1;
break; break;
default: default:
......
...@@ -75,7 +75,7 @@ int ipv6_find_tlv(struct sk_buff *skb, int offset, int type) ...@@ -75,7 +75,7 @@ int ipv6_find_tlv(struct sk_buff *skb, int offset, int type)
return offset; return offset;
switch (opttype) { switch (opttype) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD1:
optlen = 1; optlen = 1;
break; break;
default: default:
...@@ -156,7 +156,7 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff *skb) ...@@ -156,7 +156,7 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff *skb)
int i; int i;
switch (nh[off]) { switch (nh[off]) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD1:
optlen = 1; optlen = 1;
break; break;
......
...@@ -46,7 +46,7 @@ static inline void *mip6_padn(__u8 *data, __u8 padlen) ...@@ -46,7 +46,7 @@ static inline void *mip6_padn(__u8 *data, __u8 padlen)
if (!data) if (!data)
return NULL; return NULL;
if (padlen == 1) { if (padlen == 1) {
data[0] = IPV6_TLV_PAD0; data[0] = IPV6_TLV_PAD1;
} else if (padlen > 1) { } else if (padlen > 1) {
data[0] = IPV6_TLV_PADN; data[0] = IPV6_TLV_PADN;
data[1] = padlen - 2; data[1] = padlen - 2;
......
...@@ -397,7 +397,7 @@ static int tcf_csum_ipv6_hopopts(struct ipv6_opt_hdr *ip6xh, ...@@ -397,7 +397,7 @@ static int tcf_csum_ipv6_hopopts(struct ipv6_opt_hdr *ip6xh,
while (len > 1) { while (len > 1) {
switch (xh[off]) { switch (xh[off]) {
case IPV6_TLV_PAD0: case IPV6_TLV_PAD1:
optlen = 1; optlen = 1;
break; break;
case IPV6_TLV_JUMBO: case IPV6_TLV_JUMBO:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment