From 42446b353b1cbf66607fdb45176e22cba27190e7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Thu, 22 Jun 2006 14:47:19 -0700
Subject: [PATCH] --- yaml --- r: 28564 b: refs/heads/master c:
 bec0e85910b95c325a008ead7c3bbe047cc39672 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/myri10ge/myri10ge.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9981882ec3fa..8c882544d78d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cc0719181a7aa8883855140541e7892250e66af
+refs/heads/master: bec0e85910b95c325a008ead7c3bbe047cc39672
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
index e1feb58bd661..1a2b9785e998 100644
--- a/trunk/drivers/net/myri10ge/myri10ge.c
+++ b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -2120,7 +2120,7 @@ static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev)
 		goto drop;
 	}
 
-	if (skb_linearize(skb, GFP_ATOMIC))
+	if (skb_linearize(skb))
 		goto drop;
 
 	mgp->tx_linearized++;