From: Pavel Emelyanov Date: Tue, 11 Dec 2007 10:16:47 +0000 (-0800) Subject: [IPV4]: Cleanup IN_DEV_MFORWARD macro X-Git-Tag: v2.6.25-rc1~1162^2~1159 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=01ecfe9ba63aa0f23bbdb15371916ba4d5382330;p=linux-2.6-omap-h63xx.git [IPV4]: Cleanup IN_DEV_MFORWARD macro This is essentially IN_DEV_ANDCONF with proper arguments. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller --- diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index dd093ea4c48..962a062b44f 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -78,9 +78,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) (max(IPV4_DEVCONF_ALL(attr), IN_DEV_CONF_GET((in_dev), attr))) #define IN_DEV_FORWARD(in_dev) IN_DEV_CONF_GET((in_dev), FORWARDING) -#define IN_DEV_MFORWARD(in_dev) (IPV4_DEVCONF_ALL(MC_FORWARDING) && \ - IPV4_DEVCONF((in_dev)->cnf, \ - MC_FORWARDING)) +#define IN_DEV_MFORWARD(in_dev) IN_DEV_ANDCONF((in_dev), MC_FORWARDING) #define IN_DEV_RPFILTER(in_dev) IN_DEV_ANDCONF((in_dev), RP_FILTER) #define IN_DEV_SOURCE_ROUTE(in_dev) IN_DEV_ANDCONF((in_dev), \ ACCEPT_SOURCE_ROUTE)