diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 16:32:56 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 16:32:56 -0500 |
| commit | 7d7c57ddd84d8127a36471fa09241381e4a686eb (patch) | |
| tree | 6db7d125c661ad5902246251960047cdd0286bcc | |
| parent | 53e6643b3b85c5cc6c4cb7bc2639f17cac5b275a (diff) | |
| download | rt-patches-7d7c57ddd84d8127a36471fa09241381e4a686eb.tar.gz | |
refresh net-Convert-netfilter-to-percpu_locked.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | net-Convert-netfilter-to-percpu_locked.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net-Convert-netfilter-to-percpu_locked.patch b/net-Convert-netfilter-to-percpu_locked.patch index e2a50bd..2ad2a02 100644 --- a/net-Convert-netfilter-to-percpu_locked.patch +++ b/net-Convert-netfilter-to-percpu_locked.patch @@ -1,4 +1,4 @@ -From 2afdaea9d435bd15c0af5b983525dc8d5abfd746 Mon Sep 17 00:00:00 2001 +From 07812c8936700b03d5f8368bcb45be662dc62d4a Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 3 Jul 2009 08:29:53 -0500 Subject: [PATCH] net: Convert netfilter to percpu_locked @@ -100,10 +100,10 @@ index 9601587..f032d1c 100644 if (atomic_dec_and_test(&info->cpuleft)) complete(&info->completion); diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c -index 90203e1..d480acc 100644 +index f07d77f..f3c60dc 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c -@@ -261,7 +261,7 @@ unsigned int arpt_do_table(struct sk_buff *skb, +@@ -275,7 +275,7 @@ unsigned int arpt_do_table(struct sk_buff *skb, xt_info_rdlock_bh(); private = table->private; @@ -112,7 +112,7 @@ index 90203e1..d480acc 100644 e = get_entry(table_base, private->hook_entry[hook]); back = get_entry(table_base, private->underflow[hook]); -@@ -1201,7 +1201,7 @@ static int do_add_counters(struct net *net, void __user *user, unsigned int len, +@@ -1187,7 +1187,7 @@ static int do_add_counters(struct net *net, const void __user *user, i = 0; /* Choose the copy that is on our node */ @@ -120,7 +120,7 @@ index 90203e1..d480acc 100644 + curcpu = raw_smp_processor_id(); loc_cpu_entry = private->entries[curcpu]; xt_info_wrlock(curcpu); - ARPT_ENTRY_ITERATE(loc_cpu_entry, + xt_entry_foreach(iter, loc_cpu_entry, private->size) { -- 1.7.1.1 |