diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-08 20:06:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-08 20:06:56 -0700 |
| commit | 941742f49762ba4c908510f036b09a46c1b14513 (patch) | |
| tree | aafb7a72c2072f98889406668003234bed56df02 /net/mpls | |
| parent | ac7ba51c215db5739eb640f2f26025ced8668285 (diff) | |
| parent | 5879ae5fd052a63d5ac0684320cb7df3e83da7de (diff) | |
| download | linux-941742f49762ba4c908510f036b09a46c1b14513.tar.gz linux-941742f49762ba4c908510f036b09a46c1b14513.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/mpls')
| -rw-r--r-- | net/mpls/af_mpls.c | 2 | ||||
| -rw-r--r-- | net/mpls/internal.h | 1 |
2 files changed, 2 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, diff --git a/net/mpls/internal.h b/net/mpls/internal.h index b064c345042c..8cabeb5a1cb9 100644 --- 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; |