Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 135176
b: refs/heads/master
c: b0832a2
h: refs/heads/master
v: v3
  • Loading branch information
Eric Biederman authored and David S. Miller committed Mar 13, 2009
1 parent 409d383 commit d24c474
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7efb6ccc2113911e4e064f78bcd0343c4673038
refs/heads/master: b0832a2961022a076c812384435b5f0290b3fc91
11 changes: 6 additions & 5 deletions trunk/drivers/net/macvlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,12 +461,13 @@ static int macvlan_newlink(struct net_device *dev,
if (lowerdev == NULL)
return -ENODEV;

/* Don't allow macvlans on top of other macvlans - its not really
* wrong, but lockdep can't handle it and its not useful for anything
* you couldn't do directly on top of the real device.
/* When creating macvlans on top of other macvlans - use
* the real device as the lowerdev.
*/
if (lowerdev->rtnl_link_ops == dev->rtnl_link_ops)
return -ENODEV;
if (lowerdev->rtnl_link_ops == dev->rtnl_link_ops) {
struct macvlan_dev *lowervlan = netdev_priv(lowerdev);
lowerdev = lowervlan->lowerdev;
}

if (!tb[IFLA_MTU])
dev->mtu = lowerdev->mtu;
Expand Down

0 comments on commit d24c474

Please sign in to comment.