diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-10 02:42:12 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-12 00:43:22 -0400 |
commit | 7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8 (patch) | |
tree | 48bdf9385e11e1e5152f3b750fa44fd80e952266 | |
parent | d7aabf22efb50e6d52ed953ed2a43996152a7fb0 (diff) |
[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>
-rw-r--r-- | include/net/mip6.h | 3 | ||||
-rw-r--r-- | net/ipv6/mip6.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/net/mip6.h b/include/net/mip6.h index 63272610a24a..a83ad1982a90 100644 --- a/include/net/mip6.h +++ b/include/net/mip6.h | |||
@@ -28,9 +28,6 @@ | |||
28 | #include <linux/skbuff.h> | 28 | #include <linux/skbuff.h> |
29 | #include <net/sock.h> | 29 | #include <net/sock.h> |
30 | 30 | ||
31 | #define MIP6_OPT_PAD_1 0 | ||
32 | #define MIP6_OPT_PAD_N 1 | ||
33 | |||
34 | /* | 31 | /* |
35 | * Mobility Header | 32 | * Mobility Header |
36 | */ | 33 | */ |
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c index 42403c626c27..ad1cc5bbf977 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c | |||
@@ -44,9 +44,9 @@ static inline void *mip6_padn(__u8 *data, __u8 padlen) | |||
44 | if (!data) | 44 | if (!data) |
45 | return NULL; | 45 | return NULL; |
46 | if (padlen == 1) { | 46 | if (padlen == 1) { |
47 | data[0] = MIP6_OPT_PAD_1; | 47 | data[0] = IPV6_TLV_PAD0; |
48 | } else if (padlen > 1) { | 48 | } else if (padlen > 1) { |
49 | data[0] = MIP6_OPT_PAD_N; | 49 | data[0] = IPV6_TLV_PADN; |
50 | data[1] = padlen - 2; | 50 | data[1] = padlen - 2; |
51 | if (padlen > 2) | 51 | if (padlen > 2) |
52 | memset(data+2, 0, data[1]); | 52 | memset(data+2, 0, data[1]); |