diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
| commit | b194b4250c2b7e9d762823ac6045316fcd4bf4f9 (patch) | |
| tree | 8c54b5004822958ef0a7603e76a4868582e26d7f /net/dccp/ackvec.h | |
| parent | c4052da6f0c01a0b059d125d72bb934d0980b798 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/dccp/ackvec.h')
| -rw-r--r-- | net/dccp/ackvec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h index 8ca51c9191f..d0fd6c60c57 100644 --- a/net/dccp/ackvec.h +++ b/net/dccp/ackvec.h @@ -74,7 +74,7 @@ struct sk_buff; #ifdef CONFIG_IP_DCCP_ACKVEC extern struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len, - const unsigned int __nocast priority); + const gfp_t priority); extern void dccp_ackvec_free(struct dccp_ackvec *av); extern int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk, @@ -93,7 +93,7 @@ static inline int dccp_ackvec_pending(const struct dccp_ackvec *av) } #else /* CONFIG_IP_DCCP_ACKVEC */ static inline struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len, - const unsigned int __nocast priority) + const gfp_t priority) { return NULL; } |