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

Commit db115037 authored by Michal Kubeček's avatar Michal Kubeček Committed by David S. Miller
Browse files

net: fix checksum features handling in netif_skb_features() 



This is follow-up to

  da08143b ("vlan: more careful checksum features handling")

which introduced more careful feature intersection in vlan code,
taking into account that HW_CSUM should be considered superset
of IP_CSUM/IPV6_CSUM. The same is needed in netif_skb_features()
in order to avoid offloading mismatch warning when vlan is
created on top of a bond consisting of slaves supporting IP/IPv6
checksumming but not vlan Tx offloading.

Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f95f4045

net/core/dev.c

+11 −5
Original line number Diff line number Diff line
@@ -2587,13 +2587,19 @@ netdev_features_t netif_skb_features(struct sk_buff *skb) 
		return harmonize_features(skb, features);

	}



	features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_CTAG_TX |

	features = netdev_intersect_features(features,

					     skb->dev->vlan_features |

					     NETIF_F_HW_VLAN_CTAG_TX |

					     NETIF_F_HW_VLAN_STAG_TX);



	if (protocol == htons(ETH_P_8021Q) || protocol == htons(ETH_P_8021AD))

		features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |

				NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_CTAG_TX |

				NETIF_F_HW_VLAN_STAG_TX;

		features = netdev_intersect_features(features,

						     NETIF_F_SG |

						     NETIF_F_HIGHDMA |

						     NETIF_F_FRAGLIST |

						     NETIF_F_GEN_CSUM |

						     NETIF_F_HW_VLAN_CTAG_TX |

						     NETIF_F_HW_VLAN_STAG_TX);



	return harmonize_features(skb, features);

}