diff options
author | David S. Miller | 2015-06-09 05:06:56 +0200 |
---|---|---|
committer | David S. Miller | 2015-06-09 05:06:56 +0200 |
commit | 941742f49762ba4c908510f036b09a46c1b14513 (patch) | |
tree | aafb7a72c2072f98889406668003234bed56df02 /net/mpls/af_mpls.c | |
parent | net: phy: dp83867: Fix device tree entries (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.tar.gz kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.tar.xz kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/mpls/af_mpls.c')
-rw-r--r-- | net/mpls/af_mpls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 7b3f732269e4..bff427f31924 100644 --- 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, |