summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-06-22 14:47:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 15:05:56 -0700
commitbec0e85910b95c325a008ead7c3bbe047cc39672 (patch)
tree06628df44497bbcd17c7aadd2932f30d8170c8cb
parent6cc0719181a7aa8883855140541e7892250e66af (diff)
downloadlinux-3.10-bec0e85910b95c325a008ead7c3bbe047cc39672.tar.gz
linux-3.10-bec0e85910b95c325a008ead7c3bbe047cc39672.tar.bz2
linux-3.10-bec0e85910b95c325a008ead7c3bbe047cc39672.zip
[PATCH] myri10ge build fix
Someone changed skb_linearize(). Cc: Brice Goglin <bgoglin@myri.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jeff@garzik.org> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/net/myri10ge/myri10ge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e1feb58bd66..1a2b9785e99 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2120,7 +2120,7 @@ abort_linearize:
goto drop;
}
- if (skb_linearize(skb, GFP_ATOMIC))
+ if (skb_linearize(skb))
goto drop;
mgp->tx_linearized++;