1 files changed, 6 insertions, 15 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 4cd3e84e1294..2f838f1d222c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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) &&
-                        !(features & NETIF_F_FRAGLIST)) ||
+        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;