diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-01-20 13:46:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-01-20 13:46:59 +0000 |
| commit | 876dd50e11fff287af351f77e3b43003e240d385 (patch) | |
| tree | ee737952e6b9e3971e1a33188242a4ecb0c223e2 | |
| parent | bb95af7a5162c14e74d2f118b8f885a31bce209d (diff) | |
| download | upstream-876dd50e11fff287af351f77e3b43003e240d385.tar.gz upstream-876dd50e11fff287af351f77e3b43003e240d385.tar.bz2 upstream-876dd50e11fff287af351f77e3b43003e240d385.zip | |
mac80211: fix the br_port_exists compatibility macro for 2.6.38
SVN-Revision: 25051
| -rw-r--r-- | package/mac80211/patches/050-fix_br_port_exists.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/mac80211/patches/050-fix_br_port_exists.patch b/package/mac80211/patches/050-fix_br_port_exists.patch new file mode 100644 index 0000000000..b120369053 --- /dev/null +++ b/package/mac80211/patches/050-fix_br_port_exists.patch @@ -0,0 +1,50 @@ +--- a/include/linux/compat-2.6.38.h ++++ b/include/linux/compat-2.6.38.h +@@ -8,23 +8,6 @@ + #include <linux/kernel.h> + #include <linux/skbuff.h> + +-/* +- * This is not part of The 2.6.37 kernel yet but we +- * we use it to optimize the backport code we +- * need to implement. Instead of using ifdefs +- * to check what version of the check we use +- * we just replace all checks on current code +- * with this. I'll submit this upstream too, that +- * way all we'd have to do is to implement this +- * for older kernels, then we would not have to +- * edit the upstrema code for backport efforts. +- */ +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) +-#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT) +-#else +-#define br_port_exists(dev) (dev->br_port) +-#endif +- + /* rename member in struct mmc_host in include/linux/mmc/host.h */ + #define max_segs max_hw_segs + +--- a/include/linux/compat-2.6.h ++++ b/include/linux/compat-2.6.h +@@ -32,4 +32,21 @@ + #include <linux/compat-2.6.37.h> + #include <linux/compat-2.6.38.h> + ++/* ++ * This is not part of The 2.6.37 kernel yet but we ++ * we use it to optimize the backport code we ++ * need to implement. Instead of using ifdefs ++ * to check what version of the check we use ++ * we just replace all checks on current code ++ * with this. I'll submit this upstream too, that ++ * way all we'd have to do is to implement this ++ * for older kernels, then we would not have to ++ * edit the upstrema code for backport efforts. ++ */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT) ++#else ++#define br_port_exists(dev) (dev->br_port) ++#endif ++ + #endif /* LINUX_26_COMPAT_H */ |