From: YOSHIFUJI Hideaki Date: Thu, 10 Apr 2008 06:42:12 +0000 (+0900) Subject: [IPV6] MIP6: Use our standard definitions for paddings. X-Git-Tag: v2.6.26-rc1~1138^2~123^2~5 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f1eced8b0a001c4d5a8cfa5ac7b5cbc89fedab8;p=linux-2.6 [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 --- diff --git a/include/net/mip6.h b/include/net/mip6.h index 63272610a2..a83ad1982a 100644 --- a/include/net/mip6.h +++ b/include/net/mip6.h @@ -28,9 +28,6 @@ #include #include -#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 42403c626c..ad1cc5bbf9 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]);