diff --git a/[refs] b/[refs] index 8184f9043021..1e3dabe34686 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a10cedd4b905236603c6c4fd77cf338ebbfb1a60 +refs/heads/master: 7de76272b54e3677bcd247d1e1809015236a298d diff --git a/trunk/net/ipx/af_ipx.c b/trunk/net/ipx/af_ipx.c index c54f8acc97eb..180e383f707c 100644 --- a/trunk/net/ipx/af_ipx.c +++ b/trunk/net/ipx/af_ipx.c @@ -1797,7 +1797,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock, if (rc) goto out_free; if (skb->tstamp.off_sec) - skb_get_timestamp(skb, &sk->sk_stamp) + skb_get_timestamp(skb, &sk->sk_stamp); msg->msg_namelen = sizeof(*sipx);