Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / net / rxrpc / transport.c

diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
index 4268b38d92d25e4d66a972e1b498793b6004400b..ff5f4f333086974cbfa17a061c222a8bf54d6386 100644 (file)
--- a/net/rxrpc/transport.c
+++ b/net/rxrpc/transport.c
@@ -330,10 +330,10 @@ static int rxrpc_incoming_msg(struct rxrpc_transport *trans,
        msg->state = RXRPC_MSG_RECEIVED;
        skb_get_timestamp(pkt, &msg->stamp);
        if (msg->stamp.tv_sec == 0) {
-               do_gettimeofday(&msg->stamp); 
-               if (pkt->sk) 
+               do_gettimeofday(&msg->stamp);
+               if (pkt->sk)
                        sock_enable_timestamp(pkt->sk);
-       } 
+       }
        msg->seq = ntohl(msg->hdr.seq);
 
        /* attach the packet */