diff options
Diffstat (limited to 'net/bridge/br_if.c')
-rw-r--r-- | net/bridge/br_if.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index cffe1d666ba1..54d207d3a31c 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -389,6 +389,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) | |||
389 | if (br->dev->needed_headroom < dev->needed_headroom) | 389 | if (br->dev->needed_headroom < dev->needed_headroom) |
390 | br->dev->needed_headroom = dev->needed_headroom; | 390 | br->dev->needed_headroom = dev->needed_headroom; |
391 | 391 | ||
392 | if (br_fdb_insert(br, p, dev->dev_addr, 0)) | ||
393 | netdev_err(dev, "failed insert local address bridge forwarding table\n"); | ||
394 | |||
392 | spin_lock_bh(&br->lock); | 395 | spin_lock_bh(&br->lock); |
393 | changed_addr = br_stp_recalculate_bridge_id(br); | 396 | changed_addr = br_stp_recalculate_bridge_id(br); |
394 | 397 | ||
@@ -404,9 +407,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) | |||
404 | 407 | ||
405 | dev_set_mtu(br->dev, br_min_mtu(br)); | 408 | dev_set_mtu(br->dev, br_min_mtu(br)); |
406 | 409 | ||
407 | if (br_fdb_insert(br, p, dev->dev_addr, 0)) | ||
408 | netdev_err(dev, "failed insert local address bridge forwarding table\n"); | ||
409 | |||
410 | kobject_uevent(&p->kobj, KOBJ_ADD); | 410 | kobject_uevent(&p->kobj, KOBJ_ADD); |
411 | 411 | ||
412 | return 0; | 412 | return 0; |