---

yaml --- r: 315480 b: refs/heads/master c: dc90595 h: refs/heads/master v: v3
git-mirror · Jul 18, 2012 · c2cb9b1 · c2cb9b1
1 parent 5e79c37
commit c2cb9b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f150bd7f8cf742c4cdd0c929aa494ef72f7f5b13
+refs/heads/master: dc9059512c09d09b99de6cd3a8bc842507934cbb
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
@@ -733,19 +733,24 @@ static void __team_compute_features(struct team *team)
 	struct team_port *port;
 	u32 vlan_features = TEAM_VLAN_FEATURES;
 	unsigned short max_hard_header_len = ETH_HLEN;
+	unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;
 
 	list_for_each_entry(port, &team->port_list, list) {
 		vlan_features = netdev_increment_features(vlan_features,
 					port->dev->vlan_features,
 					TEAM_VLAN_FEATURES);
 
+		dst_release_flag &= port->dev->priv_flags;
 		if (port->dev->hard_header_len > max_hard_header_len)
 			max_hard_header_len = port->dev->hard_header_len;
 	}
 
 	team->dev->vlan_features = vlan_features;
 	team->dev->hard_header_len = max_hard_header_len;
 
+	flags = team->dev->priv_flags & ~IFF_XMIT_DST_RELEASE;
+	team->dev->priv_flags = flags | dst_release_flag;
+
 	netdev_change_features(team->dev);
 }