diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /net/decnet/dn_nsp_in.c | |
| parent | 9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/decnet/dn_nsp_in.c')
| -rw-r--r-- | net/decnet/dn_nsp_in.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index 547523b41c81..a2ba9db1c376 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c | |||
| @@ -801,8 +801,7 @@ got_it: | |||
| 801 | * We linearize everything except data segments here. | 801 | * We linearize everything except data segments here. |
| 802 | */ | 802 | */ |
| 803 | if (cb->nsp_flags & ~0x60) { | 803 | if (cb->nsp_flags & ~0x60) { |
| 804 | if (unlikely(skb_is_nonlinear(skb)) && | 804 | if (unlikely(skb_linearize(skb))) |
| 805 | skb_linearize(skb, GFP_ATOMIC) != 0) | ||
| 806 | goto free_out; | 805 | goto free_out; |
| 807 | } | 806 | } |
| 808 | 807 | ||