In article <20040528.141200.564308976.yoshfuji@xxxxxxxxxxxxxx> (at Fri, 28 May
2004 14:12:00 +0900 (JST)), YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>
says:
> In article <20040527220756.7c41a55b.davem@xxxxxxxxxx> (at Thu, 27 May 2004
> 22:07:56 -0700), "David S. Miller" <davem@xxxxxxxxxx> says:
>
> > On Fri, 28 May 2004 13:48:02 +0900 (JST)
> > YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx> wrote:
> >
> > > enum {
> > > :
> > > IFA_CACHEINFO,
> > > IFA_MULTICAST, /* added */
> > > __IFA_MAX
> > > };
> > >
> > > #define IFA_MAX (__IFA_MAX - 1)
> >
> > I like this last technique the best, one-line diffs :-)
>
> Ok, I'll do this.
Here's the patch for 2.6. Please apply on top of the Sirley's patch.
--- linux-2.6+max/include/linux/rtnetlink.h Fri May 28 17:56:55 2004
+++ linux-2.6+automax/include/linux/rtnetlink.h Fri May 28 17:55:55 2004
@@ -118,9 +118,10 @@
RTN_THROW, /* Not in this table */
RTN_NAT, /* Translate this address */
RTN_XRESOLVE, /* Use external resolver */
+ __RTN_MAX
};
-#define RTN_MAX RTN_XRESOLVE
+#define RTN_MAX (__RTN_MAX - 1)
/* rtm_protocol */
@@ -183,9 +184,10 @@
/* User defined values */
RT_TABLE_DEFAULT=253,
RT_TABLE_MAIN=254,
- RT_TABLE_LOCAL=255
+ RT_TABLE_LOCAL=255,
+ __RT_TABLE_MAX
};
-#define RT_TABLE_MAX RT_TABLE_LOCAL
+#define RT_TABLE_MAX (__RT_TABLE_MAX - 1)
@@ -207,9 +209,10 @@
RTA_FLOW,
RTA_CACHEINFO,
RTA_SESSION,
+ __RTA_MAX
};
-#define RTA_MAX RTA_SESSION
+#define RTA_MAX (__RTA_MAX - 1)
#define RTM_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct
rtmsg))))
#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg))
@@ -294,9 +297,10 @@
#define RTAX_INITCWND RTAX_INITCWND
RTAX_FEATURES,
#define RTAX_FEATURES RTAX_FEATURES
+ __RTAX_MAX
};
-#define RTAX_MAX RTAX_FEATURES
+#define RTAX_MAX (__RTAX_MAX - 1)
#define RTAX_FEATURE_ECN 0x00000001
#define RTAX_FEATURE_SACK 0x00000002
@@ -345,10 +349,11 @@
IFA_BROADCAST,
IFA_ANYCAST,
IFA_CACHEINFO,
- IFA_MULTICAST
+ IFA_MULTICAST,
+ __IFA_MAX
};
-#define IFA_MAX IFA_MULTICAST
+#define IFA_MAX (__IFA_MAX - 1)
/* ifa_flags */
@@ -399,10 +404,11 @@
NDA_UNSPEC,
NDA_DST,
NDA_LLADDR,
- NDA_CACHEINFO
+ NDA_CACHEINFO,
+ __NDA_MAX
};
-#define NDA_MAX NDA_CACHEINFO
+#define NDA_MAX (__NDA_MAX - 1)
#define NDA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct
ndmsg))))
#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg))
@@ -485,9 +491,10 @@
PREFIX_UNSPEC,
PREFIX_ADDRESS,
PREFIX_CACHEINFO,
+ __PREFIX_MAX
};
-#define PREFIX_MAX PREFIX_CACHEINFO
+#define PREFIX_MAX (__PREFIX_MAX - 1)
struct prefix_cacheinfo
{
@@ -549,10 +556,11 @@
#define IFLA_WIRELESS IFLA_WIRELESS
IFLA_PROTINFO, /* Protocol specific information for a link */
#define IFLA_PROTINFO IFLA_PROTINFO
+ __IFLA_MAX
};
-#define IFLA_MAX IFLA_PROTINFO
+#define IFLA_MAX (__IFLA_MAX - 1)
#define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) +
NLMSG_ALIGN(sizeof(struct ifinfomsg))))
#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
@@ -595,8 +603,11 @@
IFLA_INET6_STATS, /* statistics */
IFLA_INET6_MCAST, /* MC things. What of them? */
IFLA_INET6_CACHEINFO, /* time values and max reasm size */
+ __IFLA_INET6_MAX
};
+#define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1)
+
struct ifla_cacheinfo
{
__u32 max_reasm_len;
@@ -605,8 +616,6 @@
__u32 retrans_time;
};
-#define IFLA_INET6_MAX IFLA_INET6_CACHEINFO
-
/*****************************************************************
* Traffic control messages.
****/
@@ -630,9 +639,10 @@
TCA_STATS,
TCA_XSTATS,
TCA_RATE,
+ __TCA_MAX
};
-#define TCA_MAX TCA_RATE
+#define TCA_MAX (__TCA_MAX - 1)
#define TCA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct
tcmsg))))
#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
--- linux-2.6+max/include/linux/pkt_cls.h 2002-02-06 02:39:42 +09:00
+++ linux-2.6+automax/include/linux/pkt_cls.h 2004-05-28 17:53:49 +09:00
@@ -24,11 +24,12 @@
TCA_POLICE_RATE,
TCA_POLICE_PEAKRATE,
TCA_POLICE_AVRATE,
- TCA_POLICE_RESULT
+ TCA_POLICE_RESULT,
#define TCA_POLICE_RESULT TCA_POLICE_RESULT
+ __TCA_POLICE_MAX
};
-#define TCA_POLICE_MAX TCA_POLICE_RESULT
+#define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)
/* U32 filters */
@@ -49,9 +50,10 @@
TCA_U32_DIVISOR,
TCA_U32_SEL,
TCA_U32_POLICE,
+ __TCA_U32_MAX
};
-#define TCA_U32_MAX TCA_U32_POLICE
+#define TCA_U32_MAX (__TCA_U32_MAX - 1)
struct tc_u32_key
{
@@ -97,9 +99,10 @@
TCA_RSVP_SRC,
TCA_RSVP_PINFO,
TCA_RSVP_POLICE,
+ __TCA_RSVP_MAX
};
-#define TCA_RSVP_MAX TCA_RSVP_POLICE
+#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1)
struct tc_rsvp_gpi
{
@@ -127,9 +130,10 @@
TCA_ROUTE4_FROM,
TCA_ROUTE4_IIF,
TCA_ROUTE4_POLICE,
+ __TCA_ROUTE4_MAX
};
-#define TCA_ROUTE4_MAX TCA_ROUTE4_POLICE
+#define TCA_ROUTE4_MAX (__TCA_ROUTE4_MAX - 1)
/* FW filter */
@@ -139,9 +143,10 @@
TCA_FW_UNSPEC,
TCA_FW_CLASSID,
TCA_FW_POLICE,
+ __TCA_FW_MAX
};
-#define TCA_FW_MAX TCA_FW_POLICE
+#define TCA_FW_MAX (__TCA_FW_MAX - 1)
/* TC index filter */
@@ -154,8 +159,9 @@
TCA_TCINDEX_FALL_THROUGH,
TCA_TCINDEX_CLASSID,
TCA_TCINDEX_POLICE,
+ __TCA_TCINDEX_MAX
};
-#define TCA_TCINDEX_MAX TCA_TCINDEX_POLICE
+#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1)
#endif
--- linux-2.6+max/include/linux/xfrm.h 2003-08-08 13:04:46 +09:00
+++ linux-2.6+automax/include/linux/xfrm.h 2004-05-28 17:01:28 +09:00
@@ -152,8 +152,9 @@
XFRMA_ALG_COMP, /* struct xfrm_algo */
XFRMA_ENCAP, /* struct xfrm_algo + struct xfrm_encap_tmpl */
XFRMA_TMPL, /* 1 or more struct xfrm_user_tmpl */
+ __XFRMA_MAX
-#define XFRMA_MAX XFRMA_TMPL
+#define XFRMA_MAX (__XFRMA_MAX - 1)
};
struct xfrm_usersa_info {
--
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@xxxxxxxxxxxxxx>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
|