Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a523a5ec authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

macvlan: delay the header check for dodgy packets into lower device 



We do header check twice for a dodgy packet. One is done before
macvlan_start_xmit(), another is done before lower device's
ndo_start_xmit(). The first one seems redundant so this patch tries to
delay header check until a packet reaches its lower device (or macvtap)
through always enabling NETIF_F_GSO_ROBUST for macvlan device.

Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 799d2fff

drivers/net/macvlan.c

+3 −2
Original line number Diff line number Diff line
@@ -742,11 +742,12 @@ static struct lock_class_key macvlan_netdev_xmit_lock_key; 
static struct lock_class_key macvlan_netdev_addr_lock_key;



#define ALWAYS_ON_FEATURES \

	(NETIF_F_SG | NETIF_F_GEN_CSUM | NETIF_F_GSO_SOFTWARE | NETIF_F_LLTX)

	(NETIF_F_SG | NETIF_F_GEN_CSUM | NETIF_F_GSO_SOFTWARE | NETIF_F_LLTX | \

	 NETIF_F_GSO_ROBUST)



#define MACVLAN_FEATURES \

	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | \

	 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \

	 NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER)