diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
| commit | 59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch) | |
| tree | b337d73229a69e399d4e4f7128b33ce734660e35 /net/llc/llc_conn.c | |
| parent | 0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/llc/llc_conn.c')
| -rw-r--r-- | net/llc/llc_conn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c index 042b24a8ca4c..c761c15da421 100644 --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c | |||
| @@ -867,8 +867,7 @@ static void llc_sk_init(struct sock* sk) | |||
| 867 | * Allocates a LLC sock and initializes it. Returns the new LLC sock | 867 | * Allocates a LLC sock and initializes it. Returns the new LLC sock |
| 868 | * or %NULL if there's no memory available for one | 868 | * or %NULL if there's no memory available for one |
| 869 | */ | 869 | */ |
| 870 | struct sock *llc_sk_alloc(int family, unsigned int __nocast priority, | 870 | struct sock *llc_sk_alloc(int family, gfp_t priority, struct proto *prot) |
| 871 | struct proto *prot) | ||
| 872 | { | 871 | { |
| 873 | struct sock *sk = sk_alloc(family, priority, prot, 1); | 872 | struct sock *sk = sk_alloc(family, priority, prot, 1); |
| 874 | 873 | ||