[IPV6] MIP6: Use our standard definitions for paddings.

MIP6_OPT_PAD_X are actually for paddings in destination
option header.  Replace them with our standard IPV6_TLV_PADX.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

diff --git a/include/net/mip6.h b/include/net/mip6.h
index 63272610a24a4cd3c9f32951c78174189d5d3529..a83ad1982a90893abb1d369f8b679b1eed9fa24a 100644 (file)
--- a/include/net/mip6.h
+++ b/include/net/mip6.h
@@ -28,9 +28,6 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 
-#define MIP6_OPT_PAD_1 0
-#define MIP6_OPT_PAD_N 1
-
 /*
  * Mobility Header
  */

diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index 42403c626c272e521c619a6ae142478765b696a2..ad1cc5bbf977a9d766a78a065277d7aa457f7806 100644 (file)
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -44,9 +44,9 @@ static inline void *mip6_padn(__u8 *data, __u8 padlen)
        if (!data)
                return NULL;
        if (padlen == 1) {
-               data[0] = MIP6_OPT_PAD_1;
+               data[0] = IPV6_TLV_PAD0;
        } else if (padlen > 1) {
-               data[0] = MIP6_OPT_PAD_N;
+               data[0] = IPV6_TLV_PADN;
                data[1] = padlen - 2;
                if (padlen > 2)
                        memset(data+2, 0, data[1]);