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 /include/net/llc_conn.h | |
| parent | c4052da6f0c01a0b059d125d72bb934d0980b798 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/net/llc_conn.h')
| -rw-r--r-- | include/net/llc_conn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h index 54852ff6033b..00730d21b522 100644 --- a/include/net/llc_conn.h +++ b/include/net/llc_conn.h | |||
| @@ -93,7 +93,7 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb) | |||
| 93 | return skb->cb[sizeof(skb->cb) - 1]; | 93 | return skb->cb[sizeof(skb->cb) - 1]; |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | extern struct sock *llc_sk_alloc(int family, unsigned int __nocast priority, | 96 | extern struct sock *llc_sk_alloc(int family, gfp_t priority, |
| 97 | struct proto *prot); | 97 | struct proto *prot); |
| 98 | extern void llc_sk_free(struct sock *sk); | 98 | extern void llc_sk_free(struct sock *sk); |
| 99 | 99 | ||