Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-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 90e3d6379a42ae369ceeba06c783978858e96e71..382bc768ed565cc79bc79c8c71fa0588d2a7a78b 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1096,10 +1096,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: