Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / net / bridge / br_notify.c

diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 3a3f371b28415c110e4db6a21069f9153dafe904..2998dd1769a055b244c21a4fb9d9579b04099222 100644 (file)
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -102,6 +102,11 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
        case NETDEV_PRE_TYPE_CHANGE:
                /* Forbid underlaying device to change its type. */
                return NOTIFY_BAD;
+
+       case NETDEV_RESEND_IGMP:
+               /* Propagate to master device */
+               call_netdevice_notifiers(event, br->dev);
+               break;
        }
 
        /* Events that may cause spanning tree to refresh */