diff options
author | Jarek Poplawski <jarkao2@o2.pl> | 2007-02-13 15:35:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-02-13 15:35:26 -0500 |
commit | a10d567c89dfba90dde2e0515e25760fd74cde06 (patch) | |
tree | 86fec06aa1dfe1976d489d3d35c9930405d2caa0 /net/bridge/br_notify.c | |
parent | bbf4a6bc8c4d59a0a9033fc2cb96ec03430c96e4 (diff) |
[BRIDGE] br_if: Fix oops in port_carrier_check
Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
Acked-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_notify.c')
-rw-r--r-- | net/bridge/br_notify.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c index 8cd3e4229070..3311c4e30829 100644 --- a/net/bridge/br_notify.c +++ b/net/bridge/br_notify.c | |||
@@ -56,7 +56,9 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v | |||
56 | 56 | ||
57 | case NETDEV_CHANGE: | 57 | case NETDEV_CHANGE: |
58 | if (br->dev->flags & IFF_UP) | 58 | if (br->dev->flags & IFF_UP) |
59 | schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE); | 59 | if (schedule_delayed_work(&p->carrier_check, |
60 | BR_PORT_DEBOUNCE)) | ||
61 | dev_hold(dev); | ||
60 | break; | 62 | break; |
61 | 63 | ||
62 | case NETDEV_FEAT_CHANGE: | 64 | case NETDEV_FEAT_CHANGE: |