diff options
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index e3a8ea1bcbe2..05e42d86882d 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
| @@ -523,8 +523,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, | |||
| 523 | return -ELOOP; | 523 | return -ELOOP; |
| 524 | } | 524 | } |
| 525 | 525 | ||
| 526 | /* Device is already being bridged */ | 526 | /* Device has master upper dev */ |
| 527 | if (br_port_exists(dev)) | 527 | if (netdev_master_upper_dev_get(dev)) |
| 528 | return -EBUSY; | 528 | return -EBUSY; |
| 529 | 529 | ||
| 530 | /* No bridging devices that dislike that (e.g. wireless) */ | 530 | /* No bridging devices that dislike that (e.g. wireless) */ |