diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2010-06-02 12:24:37 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-05 02:23:16 -0700 |
| commit | b78462ebc6a4ef9074aa80abebcdd470dc5f0ce0 (patch) | |
| tree | fba32dab1e3dca2c5bb5b7d73a64a77c2b6872e8 /net/core | |
| parent | 55c95e738da85373965cb03b4f975d0fd559865b (diff) | |
| download | blackbird-op-linux-b78462ebc6a4ef9074aa80abebcdd470dc5f0ce0.tar.gz blackbird-op-linux-b78462ebc6a4ef9074aa80abebcdd470dc5f0ce0.zip | |
skbuff: add check for non-linear to warn_if_lro and needs_linearize
We can avoid an unecessary cache miss by checking if the skb is non-linear
before accessing gso_size/gso_type in skb_warn_if_lro, the same can also be
done to avoid a cache miss on nr_frags if data_len is 0.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ec01a5998d70..3abb3a6058be 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2103,9 +2103,10 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, static inline int skb_needs_linearize(struct sk_buff *skb, struct net_device *dev) { - return (skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) || - (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) || - illegal_highdma(dev, skb))); + return skb_is_nonlinear(skb) && + ((skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) || + (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) || + illegal_highdma(dev, skb)))); } /** |
