---

yaml --- r: 18810 b: refs/heads/master c: d74bbd3 h: refs/heads/master v: v3
git-mirror · Jan 17, 2006 · de3020b · de3020b
1 parent 787b7a6
commit de3020b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fadb0597d240d4ed279042cab632d567510a1a3
+refs/heads/master: d74bbd3bbfd70470446e0d8153f91967d53c0798
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -2834,6 +2834,13 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 		if (skb->data_len && (hdr_len == (skb->len - skb->data_len)) &&
 			(adapter->hw.mac_type == e1000_82571 ||
 			adapter->hw.mac_type == e1000_82572)) {
+			unsigned int pull_size;
+			pull_size = min((unsigned int)4, skb->data_len);
+			if (!__pskb_pull_tail(skb, pull_size)) {
+				printk(KERN_ERR "__pskb_pull_tail failed.\n");
+				dev_kfree_skb_any(skb);
+				return -EFAULT;
+			}
 			len = skb->len - skb->data_len;
 		}
 	}
@@ -2873,14 +2880,6 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	if(adapter->pcix_82544)
 		count += nr_frags;
 
-		unsigned int pull_size;
-		pull_size = min((unsigned int)4, skb->data_len);
-		if (!__pskb_pull_tail(skb, pull_size)) {
-			printk(KERN_ERR "__pskb_pull_tail failed.\n");
-			dev_kfree_skb_any(skb);
-			return -EFAULT;
-		}
-
 	if(adapter->hw.tx_pkt_filtering && (adapter->hw.mac_type == e1000_82573) )
 		e1000_transfer_dhcp_info(adapter, skb);