51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
|
--- 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 */
|