Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / devinet.c

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 3feb2b39030838ca08fb02e0b0063711b34e76b2..d009c6a5d9ad693cc6a521f8f69c1b384e1a35f6 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1095,10 +1095,10 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
        case NETDEV_DOWN:
                ip_mc_down(in_dev);
                break;
-       case NETDEV_BONDING_OLDTYPE:
+       case NETDEV_PRE_TYPE_CHANGE:
                ip_mc_unmap(in_dev);
                break;
-       case NETDEV_BONDING_NEWTYPE:
+       case NETDEV_POST_TYPE_CHANGE:
                ip_mc_remap(in_dev);
                break;
        case NETDEV_CHANGEMTU: