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>

2 files changed, 3 insertions, 3 deletions

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 5ca4c50ea233..b66581208cb2 100644
--- 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 dce55d4ee83b..e41456bd3cc6 100644
--- 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;