aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2012-05-17 02:00:25 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-17 15:49:51 -0400
commit1de5a71c3e6eae2fbf15e9a9e13a8fc269bb82bc (patch)
treeb28a39f932993a61855be0ffbd8844a7bddb645c /net/ipv6
parent048b899ce38c3e1db88cb4464547090ef28630f8 (diff)
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ah6.c4
-rw-r--r--net/ipv6/exthdrs.c4
-rw-r--r--net/ipv6/mip6.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 9aa3d010ac5d..5d32e7a93b26 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -127,7 +127,7 @@ static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
127 127
128 switch (opt[off]) { 128 switch (opt[off]) {
129 129
130 case IPV6_TLV_PAD0: 130 case IPV6_TLV_PAD1:
131 optlen = 1; 131 optlen = 1;
132 break; 132 break;
133 default: 133 default:
@@ -171,7 +171,7 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des
171 171
172 switch (opt[off]) { 172 switch (opt[off]) {
173 173
174 case IPV6_TLV_PAD0: 174 case IPV6_TLV_PAD1:
175 optlen = 1; 175 optlen = 1;
176 break; 176 break;
177 default: 177 default:
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index a93bd231eca1..a3cded6a1997 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -75,7 +75,7 @@ int ipv6_find_tlv(struct sk_buff *skb, int offset, int type)
75 return offset; 75 return offset;
76 76
77 switch (opttype) { 77 switch (opttype) {
78 case IPV6_TLV_PAD0: 78 case IPV6_TLV_PAD1:
79 optlen = 1; 79 optlen = 1;
80 break; 80 break;
81 default: 81 default:
@@ -156,7 +156,7 @@ static int ip6_parse_tlv(struct tlvtype_proc *procs, struct sk_buff *skb)
156 int i; 156 int i;
157 157
158 switch (nh[off]) { 158 switch (nh[off]) {
159 case IPV6_TLV_PAD0: 159 case IPV6_TLV_PAD1:
160 optlen = 1; 160 optlen = 1;
161 break; 161 break;
162 162
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index 2e02f7c9d76d..5b087c31d87b 100644
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -46,7 +46,7 @@ static inline void *mip6_padn(__u8 *data, __u8 padlen)
46 if (!data) 46 if (!data)
47 return NULL; 47 return NULL;
48 if (padlen == 1) { 48 if (padlen == 1) {
49 data[0] = IPV6_TLV_PAD0; 49 data[0] = IPV6_TLV_PAD1;
50 } else if (padlen > 1) { 50 } else if (padlen > 1) {
51 data[0] = IPV6_TLV_PADN; 51 data[0] = IPV6_TLV_PADN;
52 data[1] = padlen - 2; 52 data[1] = padlen - 2;