diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 13:12:37 (GMT) |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 13:12:37 (GMT) |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /net/bridge/br_notify.c | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
| download | linux-fsl-qoriq-0134e89c7bcc9fde1da962c82a120691e185619f.tar.xz | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/bridge/br_notify.c')
| -rw-r--r-- | net/bridge/br_notify.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c index 404d4e1..7d337c9 100644 --- a/net/bridge/br_notify.c +++ b/net/bridge/br_notify.c @@ -32,15 +32,15 @@ struct notifier_block br_device_notifier = { static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr) { struct net_device *dev = ptr; - struct net_bridge_port *p = br_port_get(dev); + struct net_bridge_port *p; struct net_bridge *br; int err; /* not a port of a bridge */ - if (!br_port_exists(dev)) + p = br_port_get_rtnl(dev); + if (!p) return NOTIFY_DONE; - p = br_port_get(dev); br = p->br; switch (event) { |