diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-11 15:43:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-11 15:43:03 -0800 |
| commit | 60dbb011df9764294284cc3e70f935eaa462e15e (patch) | |
| tree | 7bf7672001c3fc87850895577f22c0f6dc4c1138 /include | |
| parent | 4b0ef1f223be4e092632b4152ceec5627ac10f59 (diff) | |
| parent | 2f46e07995734a363608e974a82fd05d5b610750 (diff) | |
| download | linux-3.10-60dbb011df9764294284cc3e70f935eaa462e15e.tar.gz linux-3.10-60dbb011df9764294284cc3e70f935eaa462e15e.tar.bz2 linux-3.10-60dbb011df9764294284cc3e70f935eaa462e15e.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_bridge.h | 2 | ||||
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index f7e73c338c4..dd3f2013964 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -103,7 +103,7 @@ struct __fdb_entry { extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); -typedef int (*br_should_route_hook_t)(struct sk_buff *skb); +typedef int br_should_route_hook_t(struct sk_buff *skb); extern br_should_route_hook_t __rcu *br_should_route_hook; #endif diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 742bec05144..6712e713b29 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -472,7 +472,7 @@ extern void xt_free_table_info(struct xt_table_info *info); * necessary for reading the counters. */ struct xt_info_lock { - spinlock_t lock; + seqlock_t lock; unsigned char readers; }; DECLARE_PER_CPU(struct xt_info_lock, xt_info_locks); @@ -497,7 +497,7 @@ static inline void xt_info_rdlock_bh(void) local_bh_disable(); lock = &__get_cpu_var(xt_info_locks); if (likely(!lock->readers++)) - spin_lock(&lock->lock); + write_seqlock(&lock->lock); } static inline void xt_info_rdunlock_bh(void) @@ -505,7 +505,7 @@ static inline void xt_info_rdunlock_bh(void) struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks); if (likely(!--lock->readers)) - spin_unlock(&lock->lock); + write_sequnlock(&lock->lock); local_bh_enable(); } @@ -516,12 +516,12 @@ static inline void xt_info_rdunlock_bh(void) */ static inline void xt_info_wrlock(unsigned int cpu) { - spin_lock(&per_cpu(xt_info_locks, cpu).lock); + write_seqlock(&per_cpu(xt_info_locks, cpu).lock); } static inline void xt_info_wrunlock(unsigned int cpu) { - spin_unlock(&per_cpu(xt_info_locks, cpu).lock); + write_sequnlock(&per_cpu(xt_info_locks, cpu).lock); } /* |