Commit c21fd1a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1a4022f8 5d414521

net/802/garp.c

+2 −18
Original line number Diff line number Diff line
@@ -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);

net/ipv6/route.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

net/sctp/bind_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}