mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
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
This commit is contained in:
commit
fdccffc6b7
3 changed files with 7 additions and 2 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue