lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2011-05-21 00:13:03 -07:00
parent 1a4022f88d 5d41452166
commit c21fd1a8c6
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/802/garp.c
View File

@@ -544,11 +544,6 @@ static int garp_init_port(struct net_device *dev)
return 0; 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) static void garp_release_port(struct net_device *dev)
{ {
struct garp_port *port = rtnl_dereference(dev->garp_port); struct garp_port *port = rtnl_dereference(dev->garp_port);
@@ -559,7 +554,7 @@ static void garp_release_port(struct net_device *dev)
return; return;
} }
rcu_assign_pointer(dev->garp_port, NULL); 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) int garp_init_applicant(struct net_device *dev, struct garp_application *appl)
@@ -603,11 +598,6 @@ err1:
} }
EXPORT_SYMBOL_GPL(garp_init_applicant); 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) void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl)
{ {
struct garp_port *port = rtnl_dereference(dev->garp_port); 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); garp_queue_xmit(app);
dev_mc_del(dev, appl->proto.group_address); dev_mc_del(dev, appl->proto.group_address);
call_rcu(&app->rcu, garp_app_kfree_rcu); kfree_rcu(app, rcu);
garp_release_port(dev); garp_release_port(dev);
} }
EXPORT_SYMBOL_GPL(garp_uninit_applicant); EXPORT_SYMBOL_GPL(garp_uninit_applicant);
@@ -643,9 +633,3 @@ void garp_unregister_application(struct garp_application *appl)
stp_proto_unregister(&appl->proto); stp_proto_unregister(&appl->proto);
} }
EXPORT_SYMBOL_GPL(garp_unregister_application); 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);

1
net/ipv6/route.c
View File

@@ -1756,6 +1756,7 @@ static struct rt6_info * ip6_rt_copy(struct rt6_info *ort)
#ifdef CONFIG_IPV6_SUBTREES #ifdef CONFIG_IPV6_SUBTREES
memcpy(&rt->rt6i_src, &ort->rt6i_src, sizeof(struct rt6key)); memcpy(&rt->rt6i_src, &ort->rt6i_src, sizeof(struct rt6key));
#endif #endif
memcpy(&rt->rt6i_prefsrc, &ort->rt6i_prefsrc, sizeof(struct rt6key));
rt->rt6i_table = ort->rt6i_table; rt->rt6i_table = ort->rt6i_table;
} }
return rt; return rt;

2
net/sctp/bind_addr.c
View File

@@ -145,7 +145,7 @@ static void sctp_bind_addr_clean(struct sctp_bind_addr *bp)
/* Empty the bind address list. */ /* Empty the bind address list. */
list_for_each_entry_safe(addr, temp, &bp->address_list, list) { list_for_each_entry_safe(addr, temp, &bp->address_list, list) {
list_del_rcu(&addr->list); list_del_rcu(&addr->list);
call_rcu(&addr->rcu, sctp_local_addr_free); kfree_rcu(addr, rcu);
SCTP_DBG_OBJCNT_DEC(addr); SCTP_DBG_OBJCNT_DEC(addr);
} }
} }