[package] busybox: update to 1.18.5, patch from Peter Wagner

[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 f9dd282..cf0c74a 100644 (file)
--- a/package/wprobe/src/kernel/wprobe-core.c
+++ b/package/wprobe/src/kernel/wprobe-core.c
@@ -31,7 +31,10 @@
 #define static
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
 #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 */
 #endif
 
 #define WPROBE_MIN_INTERVAL            100 /* minimum measurement interval in msecs */


@@ -203,6 +206,7 @@ wprobe_get_dev(struct nlattr *attr)
 int
 wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, void *data, int len)
 {
 int
 wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, void *data, int len)
 {

+       struct wprobe_wlan_hdr *new_hdr;

        struct wprobe_filter *f;
        struct sk_buff *skb;
        unsigned long flags;
        struct wprobe_filter *f;
        struct sk_buff *skb;
        unsigned long flags;


@@ -221,7 +225,10 @@ wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, vo
        if (len + skb->len > WPROBE_MAX_FRAME_SIZE)
                len = WPROBE_MAX_FRAME_SIZE - skb->len;
 
        if (len + skb->len > WPROBE_MAX_FRAME_SIZE)
                len = WPROBE_MAX_FRAME_SIZE - skb->len;
 

-       memcpy(skb_put(skb, f->hdrlen), hdr, sizeof(struct wprobe_wlan_hdr));
+       new_hdr = (struct wprobe_wlan_hdr *) skb_put(skb, f->hdrlen);
+       memcpy(new_hdr, hdr, sizeof(struct wprobe_wlan_hdr));
+       new_hdr->len = cpu_to_be16(new_hdr->len);
+

        memcpy(skb_put(skb, len), data, len);
 
        for(i = 0; i < f->n_groups; i++) {
        memcpy(skb_put(skb, len), data, len);
 
        for(i = 0; i < f->n_groups; i++) {


@@ -236,8 +243,13 @@ wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, vo
                                def = j;
                                continue;
                        }
                                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;
                        if (sk_run_filter(skb, fi->filter, fi->hdr.n_items) == 0)
                                continue;

+#endif

 
                        found = true;
                        break;
 
                        found = true;
                        break;