diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:47:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:47:29 -0800 |
| commit | fdccffc6b711d1bfcd1e1b569537686dcad423e2 (patch) | |
| tree | 51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326 /include/net | |
| parent | 4fa639123d9e6e8dfaa3d116368f4b2478da31af (diff) | |
| parent | 3eb4801d7bde42b82f05137392a1ee0ece090bad (diff) | |
| download | kernel_samsung_tuna-fdccffc6b711d1bfcd1e1b569537686dcad423e2.zip kernel_samsung_tuna-fdccffc6b711d1bfcd1e1b569537686dcad423e2.tar.gz kernel_samsung_tuna-fdccffc6b711d1bfcd1e1b569537686dcad423e2.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: drop duplicate assignment in request_sock
[IPSEC]: Fix tunnel error handling in ipcomp6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/request_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index 11641c9..c5d7f92 100644 --- 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; - queue->rskq_accept_head = queue->rskq_accept_head = NULL; + queue->rskq_accept_head = NULL; return req; } |