diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 16:41:15 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 16:41:15 -0500 |
| commit | aac6e63322238449707cab4dfea61300ceac94f6 (patch) | |
| tree | 282a3f80289bb16e80f72961f3f5eacc12183335 | |
| parent | a35531f8e5ae471627347b654e64e8197c5845fd (diff) | |
| download | rt-patches-aac6e63322238449707cab4dfea61300ceac94f6.tar.gz | |
refresh net-ebtables-Work-around-per-cpu-assumptions.patchv2.6.33-4115-g3a5b27bv2.6.33-4065-g5057bfav2.6.33-3842-g6c0ad5dv2.6.33-3840-gb7f3a20v2.6.33-3831-g6d6b89b
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | net-ebtables-Work-around-per-cpu-assumptions.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net-ebtables-Work-around-per-cpu-assumptions.patch b/net-ebtables-Work-around-per-cpu-assumptions.patch index 35e882b..16edc83 100644 --- a/net-ebtables-Work-around-per-cpu-assumptions.patch +++ b/net-ebtables-Work-around-per-cpu-assumptions.patch @@ -1,4 +1,4 @@ -From a1026af461530b4f0a875c4bdffac4137b2db549 Mon Sep 17 00:00:00 2001 +From 58995ce91b62da5633298620a5cf5862f381223c Mon Sep 17 00:00:00 2001 From: Luis Claudio R. Goncalves <lclaudio@uudg.org> Date: Sat, 27 Nov 2010 13:04:05 -0200 Subject: [PATCH] net: ebtables: Work around per cpu assumptions @@ -16,10 +16,10 @@ Signed-off-by: "Luis Claudio R. Goncalves" <lclaudio@uudg.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c -index 0b7f262..2ffdd86 100644 +index dfb5805..1946471 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c -@@ -153,7 +153,7 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, +@@ -176,7 +176,7 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, struct ebt_table *table) { @@ -27,8 +27,8 @@ index 0b7f262..2ffdd86 100644 + int i, nentries, cpu; struct ebt_entry *point; struct ebt_counter *counter_base, *cb_base; - struct ebt_entry_target *t; -@@ -174,12 +174,14 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, + const struct ebt_entry_target *t; +@@ -197,12 +197,14 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, read_lock_bh(&table->lock); private = table->private; |