diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
| commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
| tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /net/core | |
| parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff) | |
| parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 23e0a2a9a4de..a44d27f9f0f0 100644 --- a/net/core/filter.c +++ b/net/core/filter.c | |||
| @@ -554,7 +554,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen) | |||
| 554 | EXPORT_SYMBOL(sk_chk_filter); | 554 | EXPORT_SYMBOL(sk_chk_filter); |
| 555 | 555 | ||
| 556 | /** | 556 | /** |
| 557 | * sk_filter_rcu_release: Release a socket filter by rcu_head | 557 | * sk_filter_rcu_release - Release a socket filter by rcu_head |
| 558 | * @rcu: rcu_head that contains the sk_filter to free | 558 | * @rcu: rcu_head that contains the sk_filter to free |
| 559 | */ | 559 | */ |
| 560 | static void sk_filter_rcu_release(struct rcu_head *rcu) | 560 | static void sk_filter_rcu_release(struct rcu_head *rcu) |