From: Sridhar Samudrala Date: Thu, 24 May 2018 16:55:16 +0000 (-0700) Subject: virtio_net: Introduce VIRTIO_NET_F_STANDBY feature bit X-Git-Tag: v4.1.12-124.31.3~403 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b322f7d639a3e49cca56814d41f4382a41b23c4c;p=users%2Fjedix%2Flinux-maple.git virtio_net: Introduce VIRTIO_NET_F_STANDBY feature bit This feature bit can be used by hypervisor to indicate virtio_net device to act as a standby for another device with the same MAC address. VIRTIO_NET_F_STANDBY is defined as bit 62 as it is a device feature bit. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller (cherry picked from commit 9805069d14c1b0b66b1600ea60cfc08f94841bd8) Orabug: 28122104 Signed-off-by: Vijay Balakrishna Reviewed-by: Shannon Nelson Reviewed-by: Darren Kenny (cherry picked from commit c4b1cdd0459d953eddac306c3a1fc88c8d631e17) Signed-off-by: Vijay Balakrishna Reviewed-by: Si-Wei Liu Reviewed-by: Shannon Nelson Signed-off-by: Brian Maly Conflicts: drivers/net/virtio_net.c (UEK4 doesn't have VIRTNET_FEATURES defined) include/uapi/linux/virtio_net.h (there is an additional feature bitmap in UEK5 for virtio net which cherry-pick inserted during merge) Signed-off-by: Brian Maly --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 84da82b8555e..f5df25b5a28a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2058,7 +2058,7 @@ static unsigned int features[] = { VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, VIRTIO_NET_F_CTRL_MAC_ADDR, VIRTIO_F_ANY_LAYOUT, - VIRTIO_NET_F_MTU, + VIRTIO_NET_F_MTU, VIRTIO_NET_F_STANDBY, }; static struct virtio_driver virtio_net_driver = { diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index fb5d30aa114f..ba554dd26718 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -56,6 +56,9 @@ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ #define VIRTIO_NET_F_MTU 25 /* Initial MTU advice */ +#define VIRTIO_NET_F_STANDBY 62 /* Act as standby for another device + * with the same MAC. + */ #ifndef VIRTIO_NET_NO_LEGACY #define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */ #endif /* VIRTIO_NET_NO_LEGACY */