From 650e96b9d1affa4cbbde1267b0cac759e3d12849 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 20 May 2011 18:31:30 +0000 Subject: [PATCH] --- yaml --- r: 247811 b: refs/heads/master c: 0a384b226f61b310586701669b573b49cfcbf436 h: refs/heads/master i: 247809: 6124196575b61b6e336bfd7525b7382a39145ccf 247807: 3d0bcdca1244640f3c455c296e8068e97f4e01cd v: v3 --- [refs] | 2 +- trunk/net/802/garp.c | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 6f92ac9780ae..919afb33aac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f6c6392dca9c4825c98322a1bf74991e4f0f54d +refs/heads/master: 0a384b226f61b310586701669b573b49cfcbf436 diff --git a/trunk/net/802/garp.c b/trunk/net/802/garp.c index f8300a8b5fbc..16102951d36a 100644 --- a/trunk/net/802/garp.c +++ b/trunk/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 @@ int garp_init_applicant(struct net_device *dev, struct garp_application *appl) } 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);