From: Johannes Berg <johannes.berg@xxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- backport/backport-include/linux/compat-2.6.33.h | 6 ------ backport/backport-include/linux/if.h | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/backport/backport-include/linux/compat-2.6.33.h b/backport/backport-include/linux/compat-2.6.33.h index b03fe40..485072a 100644 --- a/backport/backport-include/linux/compat-2.6.33.h +++ b/backport/backport-include/linux/compat-2.6.33.h @@ -52,12 +52,6 @@ void release_firmware(const struct firmware *fw); #define KEY_RFKILL 247 /* Key that controls all radios */ #endif -/* mask IFF_DONT_BRIDGE as RHEL6 backports this */ -#if !defined(IFF_DONT_BRIDGE) -#define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ -/* source: include/linux/if.h */ -#endif - /* mask NETDEV_POST_INIT as RHEL6 backports this */ /* this will never happen on older kernels */ #if !defined(NETDEV_POST_INIT) diff --git a/backport/backport-include/linux/if.h b/backport/backport-include/linux/if.h index 63fef8a..7147711 100644 --- a/backport/backport-include/linux/if.h +++ b/backport/backport-include/linux/if.h @@ -5,6 +5,11 @@ #include <linux/version.h> +/* mask IFF_DONT_BRIDGE as RHEL6 backports this */ +#if !defined(IFF_DONT_BRIDGE) +#define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) #define br_port_exists(dev) (dev->br_port) -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
