---

yaml --- r: 224823 b: refs/heads/master c: 15c2d75 h: refs/heads/master i: 224821: 0d71742 224819: 6a461f5 224815: 48bb492 v: v3
git-mirror · Dec 8, 2010 · 08a6e4b · 08a6e4b
1 parent fe6a390
commit 08a6e4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62ab0812137ec4f9884dd7de346238841ac03283
+refs/heads/master: 15c2d75f49189e1769c5e8f5f099d03d055c4910
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2022,16 +2022,16 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 	int rc = NETDEV_TX_OK;
 
 	if (likely(!skb->next)) {
-		if (!list_empty(&ptype_all))
-			dev_queue_xmit_nit(skb, dev);
-
 		/*
 		 * If device doesnt need skb->dst, release it right now while
 		 * its hot in this cpu cache
 		 */
 		if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
 			skb_dst_drop(skb);
 
+		if (!list_empty(&ptype_all))
+			dev_queue_xmit_nit(skb, dev);
+
 		skb_orphan_try(skb);
 
 		if (vlan_tx_tag_present(skb) &&