diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-14 08:56:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-14 08:56:52 +0200 |
| commit | 25c43bf13b1657d9a2f6a2565e9159ce31517aa5 (patch) | |
| tree | c1fef736d3227dbd3788206c746d00763247f232 /net/mpls | |
| parent | tcp: tcp_v6_connect() cleanup (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-25c43bf13b1657d9a2f6a2565e9159ce31517aa5.tar.xz linux-25c43bf13b1657d9a2f6a2565e9159ce31517aa5.zip | |
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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index bff427f31924..1f93a5978f2a 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -564,6 +564,17 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event, case NETDEV_UNREGISTER: mpls_ifdown(dev); break; + case NETDEV_CHANGENAME: + mdev = mpls_dev_get(dev); + if (mdev) { + int err; + + mpls_dev_sysctl_unregister(mdev); + err = mpls_dev_sysctl_register(dev, mdev); + if (err) + return notifier_from_errno(err); + } + break; } return NOTIFY_OK; } |