diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-31 11:50:32 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-31 11:50:32 -0400 |
commit | edb3e182b6f33c91ba8778e2198220c12712d3ad (patch) | |
tree | 6b741e144c2c83e901a325e5373dc0b8baf88534 /net/bridge/br_notify.c | |
parent | 8973a585aec125beb2a3de50bb491004299f53d5 (diff) | |
parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'net/bridge/br_notify.c')
-rw-r--r-- | net/bridge/br_notify.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c index f8fb49e34764..917311c6828b 100644 --- a/net/bridge/br_notify.c +++ b/net/bridge/br_notify.c @@ -65,6 +65,15 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v } break; + case NETDEV_FEAT_CHANGE: + if (br->dev->flags & IFF_UP) + br_features_recompute(br); + + /* could do recursive feature change notification + * but who would care?? + */ + break; + case NETDEV_DOWN: if (br->dev->flags & IFF_UP) br_stp_disable_port(p); |