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++;