diff options
| author | Eric Biederman <ebiederm@aristanetworks.com> | 2009-03-13 13:15:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-13 13:15:37 -0700 |
| commit | b0832a2961022a076c812384435b5f0290b3fc91 (patch) | |
| tree | ca4d0a09e9aabc00f1960a8fb4f2ebd82f49ba8f /drivers | |
| parent | f7efb6ccc2113911e4e064f78bcd0343c4673038 (diff) | |
| download | linux-3.10-b0832a2961022a076c812384435b5f0290b3fc91.tar.gz linux-3.10-b0832a2961022a076c812384435b5f0290b3fc91.tar.bz2 linux-3.10-b0832a2961022a076c812384435b5f0290b3fc91.zip | |
macvlan: Support creating macvlans from macvlans
When running in a network namespace whose only link to
the outside world is a macvlan device, not being
able to create another macvlan is a real pain.
So modify macvlan creation to allow automatically forward
a creation of a macvlan on a macvlan to become a creation
of a macvlan on the underlying network device.
Signed-off-by: Eric Biederman <ebiederm@aristanetworks.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/macvlan.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 7e24b504868..b5241fc0f51 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -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; |