| Message ID | 1272034539-19899-2-git-send-email-danms@us.ibm.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
DS> Signed-off-by: Dan Smith <danms@us.ibm.com> I went too deep with my send-email command line. This patch isn't related to the others, so please disregard.
diff --git a/net/checkpoint_dev.c b/net/checkpoint_dev.c index 7ccb899..2787892 100644 --- a/net/checkpoint_dev.c +++ b/net/checkpoint_dev.c @@ -136,11 +136,12 @@ static struct nlmsghdr *rtnl_get_response(struct socket *rtnl, *skb = NULL; + lock_sock(rtnl->sk); ret = sk_wait_data(rtnl->sk, &timeo); - if (!ret) - return ERR_PTR(-EPIPE); + if (ret) + *skb = skb_dequeue(&rtnl->sk->sk_receive_queue); + release_sock(rtnl->sk); - *skb = skb_dequeue(&rtnl->sk->sk_receive_queue); if (!*skb) return ERR_PTR(-EPIPE);
Signed-off-by: Dan Smith <danms@us.ibm.com> --- net/checkpoint_dev.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)