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>

diff --git a/include/linux/in6.h b/include/linux/in6.h
index 5c83d9e3eb8f1bbc14cb7e906394080fb1760686..cba469ba11a42d9e59a200623739aa6409fb3e7e 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -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

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 5ca4c50ea233f260d94f7f83b4892fc0e2958da4..b66581208cb2fc2b8972dcdeb1654550efdba0df 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -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);
 

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index dce55d4ee83b95b97dffd7ccab94a2ad8815a225..e41456bd3cc6bb6c374fff4ef76afe6326283732 100644 (file)
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -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;
 

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 9aa3d010ac5d9db1f96be9dc8d0b9fd5e695f600..5d32e7a93b2605ac1f3ddac52e0dbfe77ab78407 100644 (file)
--- 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)
 
                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:

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index a93bd231eca141b5dc4b0699f134b83d08fbfa68..a3cded6a1997d0e5280759a82d4c0372083e9ad8 100644 (file)
--- 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)
                        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;
 

diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index 2e02f7c9d76d70b07139573f1c1e28707ab6e25e..5b087c31d87b54f5a2574903775b81692bcd2616 100644 (file)
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -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;

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 882124ceb70c1be6ef1c87105d276a5e84e506ba..2c8ad7c86e4340e246394e075e18fcffc26ca722 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -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: