projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rsync://bughost.org/repos/ieee80211-delta/
[powerpc.git]
/
include
/
net
/
inet_connection_sock.h
diff --git
a/include/net/inet_connection_sock.h
b/include/net/inet_connection_sock.h
index
651f824
..
b0c9906
100644
(file)
--- a/
include/net/inet_connection_sock.h
+++ b/
include/net/inet_connection_sock.h
@@
-94,7
+94,7
@@
static inline void *inet_csk_ca(const struct sock *sk)
extern struct sock *inet_csk_clone(struct sock *sk,
const struct request_sock *req,
- const
unsigned int __nocas
t priority);
+ const
gfp_
t priority);
enum inet_csk_ack_state_t {
ICSK_ACK_SCHED = 1,