From 76052e81c0c20e5c20a02de09140cba1d0028cca Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 11 Dec 2007 02:16:47 -0800 Subject: [PATCH] --- yaml --- r: 78389 b: refs/heads/master c: 01ecfe9ba63aa0f23bbdb15371916ba4d5382330 h: refs/heads/master i: 78387: 5eeefe2d25616838dae95eeb21b793e3f13f87c7 v: v3 --- [refs] | 2 +- trunk/include/linux/inetdevice.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0ae04c4b762b..a4fff9eeb874 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95c9382a345262637d3e5c7da5f09f0f46daa930 +refs/heads/master: 01ecfe9ba63aa0f23bbdb15371916ba4d5382330 diff --git a/trunk/include/linux/inetdevice.h b/trunk/include/linux/inetdevice.h index dd093ea4c489..962a062b44ff 100644 --- a/trunk/include/linux/inetdevice.h +++ b/trunk/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)