From 4393766caec486873a5272fe6cde8f6dee4ffc43 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 10 Apr 2008 15:42:12 +0900
Subject: [PATCH] --- yaml --- r: 90638 b: refs/heads/master c:
 7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/mip6.h | 3 ---
 trunk/net/ipv6/mip6.c    | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9c31cb3a6ec8..4432a0b63598 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7aabf22efb50e6d52ed953ed2a43996152a7fb0
+refs/heads/master: 7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8
diff --git a/trunk/include/net/mip6.h b/trunk/include/net/mip6.h
index 63272610a24a..a83ad1982a90 100644
--- a/trunk/include/net/mip6.h
+++ b/trunk/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/trunk/net/ipv6/mip6.c b/trunk/net/ipv6/mip6.c
index 42403c626c27..ad1cc5bbf977 100644
--- a/trunk/net/ipv6/mip6.c
+++ b/trunk/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]);