dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Eldad Zack 2012-05-17 06:00:25 +00:00 committed by David S. Miller
parent 048b899ce3
commit 1de5a71c3e
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/in6.h
View File

@ -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

4
net/bridge/br_multicast.c
View File

@ -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);

2
net/bridge/br_netfilter.c
View File

@ -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;

4
net/ipv6/ah6.c
View File

@ -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:

4
net/ipv6/exthdrs.c
View File

@ -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;

2
net/ipv6/mip6.c
View File

@ -46,7 +46,7 @@ static inline void *mip6_padn(__u8 *data, __u8 padlen)
if (!data)
return NULL;
if (padlen == 1) {
data[0] = IPV6_TLV_PAD0;
data[0] = IPV6_TLV_PAD1;
} else if (padlen > 1) {
data[0] = IPV6_TLV_PADN;
data[1] = padlen - 2;

2
net/sched/act_csum.c
View File

@ -397,7 +397,7 @@ static int tcf_csum_ipv6_hopopts(struct ipv6_opt_hdr *ip6xh,
while (len > 1) {
switch (xh[off]) {
case IPV6_TLV_PAD0:
case IPV6_TLV_PAD1:
optlen = 1;
break;
case IPV6_TLV_JUMBO: