git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
net
/
llc_conn.h
diff --git
a/include/net/llc_conn.h
b/include/net/llc_conn.h
index
54852ff
..
00730d2
100644
(file)
--- 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)
return skb->cb[sizeof(skb->cb) - 1];
}
-extern struct sock *llc_sk_alloc(int family,
unsigned int __nocas
t priority,
+extern struct sock *llc_sk_alloc(int family,
gfp_
t priority,
struct proto *prot);
extern void llc_sk_free(struct sock *sk);