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

Commit 7d073c68 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

bnx2x: Dont update vlan_features in bnx2x_set_tso() 



Patrick said : "vlan_features doesn't need to be updated, the resulting
dev->features of the VLAN device is computed as the intersection of
dev->features and dev->vlan_features."

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5eb0589

drivers/net/bnx2x_main.c

+0 −8
Original line number Diff line number Diff line
@@ -9349,17 +9349,9 @@ static int bnx2x_set_tso(struct net_device *dev, u32 data) 
	if (data) {

		dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);

		dev->features |= NETIF_F_TSO6;

#ifdef BCM_VLAN

		dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);

		dev->vlan_features |= NETIF_F_TSO6;

#endif

	} else {

		dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);

		dev->features &= ~NETIF_F_TSO6;

#ifdef BCM_VLAN

		dev->vlan_features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);

		dev->vlan_features &= ~NETIF_F_TSO6;

#endif

	}



	return 0;