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

2015-06-08 20:06:56 -07:00
parent ac7ba51c21 5879ae5fd0
commit 941742f497
140 changed files with 1112 additions and 716 deletions
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -541,7 +541,7 @@ static void mpls_ifdown(struct net_device *dev)

 	RCU_INIT_POINTER(dev->mpls_ptr, NULL);

-	kfree(mdev);
+	kfree_rcu(mdev, rcu);
 }

 static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
--- a/net/mpls/internal.h
+++ b/net/mpls/internal.h
@@ -16,6 +16,7 @@ struct mpls_dev {
 	int			input_enabled;

 	struct ctl_table_header *sysctl;
+	struct rcu_head		rcu;
 };

 struct sk_buff;