kernel: update linux 3.2 to 3.2.12

[openwrt.git] / package / wprobe / src / kernel / wprobe-core.c

diff --git a/package/wprobe/src/kernel/wprobe-core.c b/package/wprobe/src/kernel/wprobe-core.c
index ed22457..6ec847a 100644 (file)
--- a/package/wprobe/src/kernel/wprobe-core.c
+++ b/package/wprobe/src/kernel/wprobe-core.c
@@ -24,6 +24,9 @@
 #else
 #include <linux/list.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+#include <linux/prefetch.h>
+#endif
 #include <linux/skbuff.h>
 #include <linux/wprobe.h>
 #include <linux/math64.h>
@@ -31,7 +34,10 @@
 #define static
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-#define list_for_each_rcu __list_for_each_rcu
+#define list_for_each_rcu(pos, head) \
+for (pos = rcu_dereference((head)->next); \
+prefetch(pos->next), pos != (head); \
+pos = rcu_dereference(pos->next))
 #endif
 
 #define WPROBE_MIN_INTERVAL            100 /* minimum measurement interval in msecs */
@@ -240,8 +246,13 @@ wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, vo
                                def = j;
                                continue;
                        }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+                       if (sk_run_filter(skb, fi->filter) == 0)
+                               continue;
+#else
                        if (sk_run_filter(skb, fi->filter, fi->hdr.n_items) == 0)
                                continue;
+#endif
 
                        found = true;
                        break;