diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:13:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:13:03 -0700 |
| commit | c21fd1a8c68ce3f49b00caf10337169262cfb8ad (patch) | |
| tree | 37bb9c0511ece948cc3913f4df21166768379f5e | |
| parent | VFS: move BUG_ON test for symlink nd->depth after current->link_count test (diff) | |
| parent | sctp: Fix build failure. (diff) | |
| download | linux-dev-c21fd1a8c68ce3f49b00caf10337169262cfb8ad.tar.xz linux-dev-c21fd1a8c68ce3f49b00caf10337169262cfb8ad.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sctp: Fix build failure.
garp: use kfree_rcu()
ipv6: copy prefsrc setting when copying route entry
| -rw-r--r-- | net/802/garp.c | 20 | ||||
| -rw-r--r-- | net/ipv6/route.c | 1 | ||||
| -rw-r--r-- | net/sctp/bind_addr.c | 2 |
3 files changed, 4 insertions, 19 deletions
diff --git a/net/802/garp.c b/net/802/garp.c index f8300a8b5fbc..16102951d36a 100644 --- a/net/802/garp.c +++ b/net/802/garp.c @@ -544,11 +544,6 @@ static int garp_init_port(struct net_device *dev) return 0; } -static void garp_kfree_rcu(struct rcu_head *head) -{ - kfree(container_of(head, struct garp_port, rcu)); -} - static void garp_release_port(struct net_device *dev) { struct garp_port *port = rtnl_dereference(dev->garp_port); @@ -559,7 +554,7 @@ static void garp_release_port(struct net_device *dev) return; } rcu_assign_pointer(dev->garp_port, NULL); - call_rcu(&port->rcu, garp_kfree_rcu); + kfree_rcu(port, rcu); } int garp_init_applicant(struct net_device *dev, struct garp_application *appl) @@ -603,11 +598,6 @@ err1: } EXPORT_SYMBOL_GPL(garp_init_applicant); -static void garp_app_kfree_rcu(struct rcu_head *head) -{ - kfree(container_of(head, struct garp_applicant, rcu)); -} - void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl) { struct garp_port *port = rtnl_dereference(dev->garp_port); @@ -625,7 +615,7 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl garp_queue_xmit(app); dev_mc_del(dev, appl->proto.group_address); - call_rcu(&app->rcu, garp_app_kfree_rcu); + kfree_rcu(app, rcu); garp_release_port(dev); } EXPORT_SYMBOL_GPL(garp_uninit_applicant); @@ -643,9 +633,3 @@ void garp_unregister_application(struct garp_application *appl) stp_proto_unregister(&appl->proto); } EXPORT_SYMBOL_GPL(garp_unregister_application); - -static void __exit garp_cleanup_module(void) -{ - rcu_barrier(); /* Wait for completion of call_rcu()'s */ -} -module_exit(garp_cleanup_module); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f1be5c5c85ef..de2b1decd786 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1756,6 +1756,7 @@ static struct rt6_info * ip6_rt_copy(struct rt6_info *ort) #ifdef CONFIG_IPV6_SUBTREES memcpy(&rt->rt6i_src, &ort->rt6i_src, sizeof(struct rt6key)); #endif + memcpy(&rt->rt6i_prefsrc, &ort->rt6i_prefsrc, sizeof(struct rt6key)); rt->rt6i_table = ort->rt6i_table; } return rt; diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index 6338413376c8..83e3011c19ca 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c @@ -145,7 +145,7 @@ static void sctp_bind_addr_clean(struct sctp_bind_addr *bp) /* Empty the bind address list. */ list_for_each_entry_safe(addr, temp, &bp->address_list, list) { list_del_rcu(&addr->list); - call_rcu(&addr->rcu, sctp_local_addr_free); + kfree_rcu(addr, rcu); SCTP_DBG_OBJCNT_DEC(addr); } } |