Commit c1e756bf authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

Revert "net: core: introduce netif_skb_dev_features" 



This reverts commit d2069403,
there are no more callers.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7ba65d7

include/linux/netdevice.h

+1 −6
Original line number Diff line number Diff line
@@ -3180,12 +3180,7 @@ void netdev_change_features(struct net_device *dev); 
void netif_stacked_transfer_operstate(const struct net_device *rootdev,

					struct net_device *dev);



netdev_features_t netif_skb_dev_features(struct sk_buff *skb,

					 const struct net_device *dev);

static inline netdev_features_t netif_skb_features(struct sk_buff *skb)

{

	return netif_skb_dev_features(skb, skb->dev);

}

netdev_features_t netif_skb_features(struct sk_buff *skb);



static inline bool net_gso_ok(netdev_features_t features, int gso_type)

{

net/core/dev.c

+10 −12
Original line number Diff line number Diff line
@@ -2418,7 +2418,7 @@ EXPORT_SYMBOL(netdev_rx_csum_fault); 
 * 2. No high memory really exists on this machine.

 */



static int illegal_highdma(const struct net_device *dev, struct sk_buff *skb)

static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)

{

#ifdef CONFIG_HIGHMEM

	int i;
@@ -2493,7 +2493,6 @@ static int dev_gso_segment(struct sk_buff *skb, netdev_features_t features) 
}



static netdev_features_t harmonize_features(struct sk_buff *skb,

					    const struct net_device *dev,

	netdev_features_t features)

{

	int tmp;
@@ -2501,30 +2500,29 @@ static netdev_features_t harmonize_features(struct sk_buff *skb, 
	if (skb->ip_summed != CHECKSUM_NONE &&

	    !can_checksum_protocol(features, skb_network_protocol(skb, &tmp))) {

		features &= ~NETIF_F_ALL_CSUM;

	} else if (illegal_highdma(dev, skb)) {

	} else if (illegal_highdma(skb->dev, skb)) {

		features &= ~NETIF_F_SG;

	}



	return features;

}



netdev_features_t netif_skb_dev_features(struct sk_buff *skb,

					 const struct net_device *dev)

netdev_features_t netif_skb_features(struct sk_buff *skb)

{

	__be16 protocol = skb->protocol;

	netdev_features_t features = dev->features;

	netdev_features_t features = skb->dev->features;



	if (skb_shinfo(skb)->gso_segs > dev->gso_max_segs)

	if (skb_shinfo(skb)->gso_segs > skb->dev->gso_max_segs)

		features &= ~NETIF_F_GSO_MASK;



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

		struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;

		protocol = veh->h_vlan_encapsulated_proto;

	} else if (!vlan_tx_tag_present(skb)) {

		return harmonize_features(skb, dev, features);

		return harmonize_features(skb, features);

	}



	features &= (dev->vlan_features | NETIF_F_HW_VLAN_CTAG_TX |

	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))
@@ -2532,9 +2530,9 @@ netdev_features_t netif_skb_dev_features(struct sk_buff *skb, 
				NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_CTAG_TX |

				NETIF_F_HW_VLAN_STAG_TX;



	return harmonize_features(skb, dev, features);

	return harmonize_features(skb, features);

}

EXPORT_SYMBOL(netif_skb_dev_features);

EXPORT_SYMBOL(netif_skb_features);



int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,

			struct netdev_queue *txq)