8 years ago · fb652fdfe8
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -841,7 +841,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;
 
				 
			
 
				 #define MACVLAN_FEATURES \
			
 
				 	(NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \
			
 
				-	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_LRO | \
			
 
				+	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_LRO | \
			
 
				 	 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)
			
 
				 
			
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -49,7 +49,7 @@ static struct class macvtap_class = {
 
				 static struct cdev macvtap_cdev;
			
 
				 
			
 
				 #define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \
			
 
				-		      NETIF_F_TSO6 | NETIF_F_UFO)
			
 
				+		      NETIF_F_TSO6)
			
 
				 
			
 
				 static void macvtap_count_tx_dropped(struct tap_dev *tap)
			
 
				 {