when changing the mac address of a bridge interface, keep member interface addresses...

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.33 / 209-mini_fo.patch

diff --git a/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
index 0b4091c..b2625cd 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
@@ -1847,7 +1847,7 @@
 +      };
 --- /dev/null
 +++ b/fs/mini_fo/fist.h
 +      };
 --- /dev/null
 +++ b/fs/mini_fo/fist.h

-@@ -0,0 +1,252 @@
+@@ -0,0 +1,254 @@

 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 + * Copyright (c) 2001-2003 Stony Brook University
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 + * Copyright (c) 2001-2003 Stony Brook University


@@ -1880,7 +1880,9 @@
 + */
 +#ifdef __KERNEL__
 +#include <linux/version.h>
 + */
 +#ifdef __KERNEL__
 +#include <linux/version.h>

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)

 +#include <linux/autoconf.h>
 +#else
 +#include <linux/config.h>
 +#include <linux/autoconf.h>
 +#else
 +#include <linux/config.h>