net offloading: Convert skb_need_linearize() to use precomputed features. (02932ce9) · Commits · 戴 / test

This switches skb_need_linearize() to use the features that have been centrally computed. In doing so, this fixes a problem where scatter/gather should not be used because the card does not support checksum offloading on that type of packet. On device registration we only check that some form of checksum offloading is available if scatter/gatther is enabled but we must also check at transmission time. Examples of this include IPv6 or vlan packets on a NIC that only supports IPv4 offloading. Signed-off-by:

Jesse Gross <jesse@nicira.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/dev.c

+6 −15

Original line number	Diff line number	Diff line
		@@ -2059,22 +2059,13 @@ EXPORT_SYMBOL(netif_skb_features);
		* support DMA from it.
		*/
		static inline int skb_needs_linearize(struct sk_buff *skb,
		struct net_device *dev)
		int features)
		{
		if (skb_is_nonlinear(skb)) {
		int features = dev->features;

		if (vlan_tx_tag_present(skb))
		features &= dev->vlan_features;

		return (skb_has_frag_list(skb) &&
		return skb_is_nonlinear(skb) &&
		((skb_has_frag_list(skb) &&
		!(features & NETIF_F_FRAGLIST)) \|\|
		(skb_shinfo(skb)->nr_frags &&
		(!(features & NETIF_F_SG) \|\|
		illegal_highdma(dev, skb)));
		}

		return 0;
		!(features & NETIF_F_SG)));
		}

		int dev_hard_start_xmit(struct sk_buff skb, struct net_device dev,
		@@ -2115,7 +2106,7 @@ int dev_hard_start_xmit(struct sk_buff skb, struct net_device dev,
		if (skb->next)
		goto gso;
		} else {
		if (skb_needs_linearize(skb, dev) &&
		if (skb_needs_linearize(skb, features) &&
		__skb_linearize(skb))
		goto out_kfree_skb;

Admin message