diff options
| author |   YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-10 15:42:12 +0900 |
|---|---|---|
| committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-12 13:43:22 +0900 |
| commit | 7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8 (patch) | |
| tree | 48bdf9385e11e1e5152f3b750fa44fd80e952266 | |
| parent | [IPV6]: Use in6addr_any where appropriate. (diff) | |
| download | linux-dev-7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8.tar.xz linux-dev-7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8.zip | |
[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 @@ #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 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) 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]); |