diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /net/dccp | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 29250749f16f..d59f86f7ceab 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
| @@ -495,7 +495,7 @@ void dccp_send_close(struct sock *sk, const int active) | |||
| 495 | { | 495 | { |
| 496 | struct dccp_sock *dp = dccp_sk(sk); | 496 | struct dccp_sock *dp = dccp_sk(sk); |
| 497 | struct sk_buff *skb; | 497 | struct sk_buff *skb; |
| 498 | const unsigned int prio = active ? GFP_KERNEL : GFP_ATOMIC; | 498 | const gfp_t prio = active ? GFP_KERNEL : GFP_ATOMIC; |
| 499 | 499 | ||
| 500 | skb = alloc_skb(sk->sk_prot->max_header, prio); | 500 | skb = alloc_skb(sk->sk_prot->max_header, prio); |
| 501 | if (skb == NULL) | 501 | if (skb == NULL) |