aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-08-30 19:13:51 -0700
committerDavid S. Miller <davem@davemloft.net>2014-09-01 17:39:56 -0700
commit50cbe9ab5f8d92d2d4a327b56e96559d8f63a1fa (patch)
tree6d46c376e7081c0b32d8d88a74420fd9f7c152b8 /net/core
parentnet: Separate out SKB validation logic from transmit path. (diff)
downloadlinux-dev-50cbe9ab5f8d92d2d4a327b56e96559d8f63a1fa.tar.xz
linux-dev-50cbe9ab5f8d92d2d4a327b56e96559d8f63a1fa.zip
net: Validate xmit SKBs right when we pull them out of the qdisc.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 704a5434f77d..75bc5b068a13 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2656,7 +2656,7 @@ struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, netdev_features_t featur
return skb;
}
-static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev)
+struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev)
{
netdev_features_t features;
@@ -2719,10 +2719,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
{
int rc = NETDEV_TX_OK;
- skb = validate_xmit_skb(skb, dev);
- if (!skb)
- return rc;
-
if (likely(!skb->next))
return xmit_one(skb, dev, txq, false);