diff options
author | Andrew Morton <akpm@osdl.org> | 2006-06-22 23:47:19 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 00:05:56 +0200 |
commit | bec0e85910b95c325a008ead7c3bbe047cc39672 (patch) | |
tree | 06628df44497bbcd17c7aadd2932f30d8170c8cb /drivers/net/myri10ge | |
parent | [PATCH] suspend_console() warning fix (diff) | |
download | linux-bec0e85910b95c325a008ead7c3bbe047cc39672.tar.xz linux-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>
Diffstat (limited to 'drivers/net/myri10ge')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index e1feb58bd661..1a2b9785e998 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++; |