---

yaml --- r: 290028 b: refs/heads/master c: a2a5b32 h: refs/heads/master v: v3
git-mirror · Feb 7, 2012 · 0eb50e5 · 0eb50e5
1 parent 056f735
commit 0eb50e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24b706b2f4bb28c34d32f9d333d8a118215a38cc
+refs/heads/master: a2a5b3235d0dce0feaadf4e76727adea1caa6869
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5023,7 +5023,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 		if (skb->data_len && (hdr_len == len)) {
 			unsigned int pull_size;
 
-			pull_size = min((unsigned int)4, skb->data_len);
+			pull_size = min_t(unsigned int, 4, skb->data_len);
 			if (!__pskb_pull_tail(skb, pull_size)) {
 				e_err("__pskb_pull_tail failed.\n");
 				dev_kfree_skb_any(skb);