|
@@ -377,12 +377,16 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
|
|
|
struct net_bridge_port *p;
|
|
|
int err = 0;
|
|
|
|
|
|
- if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER)
|
|
|
+ /* Don't allow bridging non-ethernet like devices */
|
|
|
+ if ((dev->flags & IFF_LOOPBACK) ||
|
|
|
+ dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ /* No bridging of bridges */
|
|
|
if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit)
|
|
|
return -ELOOP;
|
|
|
|
|
|
+ /* Device is already being bridged */
|
|
|
if (dev->br_port != NULL)
|
|
|
return -EBUSY;
|
|
|
|