diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /drivers/block/aoe/aoenet.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/block/aoe/aoenet.c')
| -rw-r--r-- | drivers/block/aoe/aoenet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index fdff774b8ab9..c1434ed11880 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c | |||
| @@ -116,8 +116,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, | |||
| 116 | skb = skb_share_check(skb, GFP_ATOMIC); | 116 | skb = skb_share_check(skb, GFP_ATOMIC); |
| 117 | if (skb == NULL) | 117 | if (skb == NULL) |
| 118 | return 0; | 118 | return 0; |
| 119 | if (skb_is_nonlinear(skb)) | 119 | if (skb_linearize(skb)) |
| 120 | if (skb_linearize(skb, GFP_ATOMIC) < 0) | ||
| 121 | goto exit; | 120 | goto exit; |
| 122 | if (!is_aoe_netif(ifp)) | 121 | if (!is_aoe_netif(ifp)) |
| 123 | goto exit; | 122 | goto exit; |