netfilter: xtables: combine struct xt_match_param and xt_target_param

[mv-sheeva.git] / net / bridge / br_notify.c

diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 763a3ec292e599081ad04394fde8d1e9914a2ea3..1413b72acc7fd8851fa163423582665f4f097fb0 100644 (file)
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -82,6 +82,10 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
        case NETDEV_UNREGISTER:
                br_del_if(br, dev);
                break;
+
+       case NETDEV_PRE_TYPE_CHANGE:
+               /* Forbid underlaying device to change its type. */
+               return NOTIFY_BAD;
        }
 
        /* Events that may cause spanning tree to refresh */