diff --git a/[refs] b/[refs]
index 0bbaa5e1a449..b7733230fdcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcdc90b025e69a38f9ec2742df099c7ddaa331fe
+refs/heads/master: 3ed7147189d2fbe8ac6da95db2fd9d6d52f53ce9
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index d44cca327588..ad86660fb8f9 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/drivers/net/team/team.c
@@ -1794,10 +1794,12 @@ static void team_setup(struct net_device *dev)
 
 	dev->features |= NETIF_F_LLTX;
 	dev->features |= NETIF_F_GRO;
-	dev->hw_features = NETIF_F_HW_VLAN_TX |
+	dev->hw_features = TEAM_VLAN_FEATURES |
+			   NETIF_F_HW_VLAN_TX |
 			   NETIF_F_HW_VLAN_RX |
 			   NETIF_F_HW_VLAN_FILTER;
 
+	dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM);
 	dev->features |= dev->hw_features;
 }