diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-02-24 13:01:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-24 13:01:05 -0800 |
| commit | fad4271bec382a7a985ba9c1b31c85611ec90708 (patch) | |
| tree | a93e0b61558f9e539b3f5371ab571500b800019f /drivers/net | |
| parent | Merge branch 'Add-tests-for-unlocked-flower-classifier-implementation' (diff) | |
| parent | vxlan: add ndo_change_proto_down support (diff) | |
| download | linux-dev-fad4271bec382a7a985ba9c1b31c85611ec90708.tar.xz linux-dev-fad4271bec382a7a985ba9c1b31c85611ec90708.zip | |
Merge branch 'net-protodown-support-for-macvlan-and-vxlan'
Andy Roulin says:
====================
net: protodown support for macvlan and vxlan
This patch series adds dev_change_proto_down_generic, a generic
implementation of ndo_change_proto_down, which sets the netdev carrier
state according to the new proto_down value.
This handler adds the ability to set protodown on macvlan and vxlan
interfaces in a generic way for use by control protocols like VRRPD.
Patch (1) introduces the handler in net/code/dev.c. Patch (2) and (3) add
support for change_proto_down in macvlan and vxlan drivers, respectively,
using the new function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macvlan.c | 1 | ||||
| -rw-r--r-- | drivers/net/vxlan.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 26e53832b095..0c0f105657d3 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1122,6 +1122,7 @@ static const struct net_device_ops macvlan_netdev_ops = { #endif .ndo_get_iflink = macvlan_dev_get_iflink, .ndo_features_check = passthru_features_check, + .ndo_change_proto_down = dev_change_proto_down_generic, }; void macvlan_common_setup(struct net_device *dev) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 33edc78e818d..577201cd880c 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2923,6 +2923,7 @@ static const struct net_device_ops vxlan_netdev_ether_ops = { .ndo_fdb_dump = vxlan_fdb_dump, .ndo_fdb_get = vxlan_fdb_get, .ndo_fill_metadata_dst = vxlan_fill_metadata_dst, + .ndo_change_proto_down = dev_change_proto_down_generic, }; static const struct net_device_ops vxlan_netdev_raw_ops = { |