diff options
| author |   Theuns Verwoerd <Theuns.Verwoerd@alliedtelesis.co.nz> | 2017-01-31 12:23:46 +1300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-01 11:53:23 -0500 |
| commit | 160ca0142431c19386db976302fd4b07c587f651 (patch) | |
| tree | e0969dbd871a4e024c1a7cad5ef09474b1d31ac4 /net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next (diff) | |
| download | linux-dev-160ca0142431c19386db976302fd4b07c587f651.tar.xz linux-dev-160ca0142431c19386db976302fd4b07c587f651.zip | |
rtnetlink: Handle IFLA_MASTER parameter when processing rtnl_newlink
Allow a master interface to be specified as one of the parameters when
creating a new interface via rtnl_newlink. Previously this would
require invoking interface creation, waiting for it to complete, and
then separately binding that new interface to a master.
In particular, this is used when creating a macvlan child interface for
VRRP in a VRF configuration, allowing the interface creator to specify
directly what master interface should be inherited by the child,
without having to deal with asynchronous complications and potential
race conditions.
Signed-off-by: Theuns Verwoerd <theuns.verwoerd@alliedtelesis.co.nz>
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/rtnetlink.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 152744643074..adfb54b896da 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2570,7 +2570,7 @@ replay: return -ENODEV; } - if (tb[IFLA_MAP] || tb[IFLA_MASTER] || tb[IFLA_PROTINFO]) + if (tb[IFLA_MAP] || tb[IFLA_PROTINFO]) return -EOPNOTSUPP; if (!ops) { @@ -2652,6 +2652,11 @@ replay: if (err < 0) goto out_unregister; } + if (tb[IFLA_MASTER]) { + err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER])); + if (err) + goto out_unregister; + } out: if (link_net) put_net(link_net); |