projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18
[powerpc.git]
/
include
/
net
/
request_sock.h
diff --git
a/include/net/request_sock.h
b/include/net/request_sock.h
index
b52cc52
..
c5d7f92
100644
(file)
--- a/
include/net/request_sock.h
+++ b/
include/net/request_sock.h
@@
-145,7
+145,7
@@
static inline struct request_sock *
{
struct request_sock *req = queue->rskq_accept_head;
{
struct request_sock *req = queue->rskq_accept_head;
- queue->rskq_accept_head =
queue->rskq_accept_head =
NULL;
+ queue->rskq_accept_head = NULL;
return req;
}
return req;
}
@@
-244,7
+244,7
@@
static inline int reqsk_queue_is_full(const struct request_sock_queue *queue)
static inline void reqsk_queue_hash_req(struct request_sock_queue *queue,
u32 hash, struct request_sock *req,
static inline void reqsk_queue_hash_req(struct request_sock_queue *queue,
u32 hash, struct request_sock *req,
- unsigned timeout)
+ unsigned
long
timeout)
{
struct listen_sock *lopt = queue->listen_opt;
{
struct listen_sock *lopt = queue->listen_opt;