Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 1eaf529efac15e83cb935ce7ad18a5cacd207d17..ac3cabdca78cb9e2ec3285cf3d6084315c336015 100644 (file)
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -18,6 +18,7 @@
 #include <linux/ctype.h>
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
+#define rxrpc_debug rxkad_debug
 #include "ar-internal.h"
 
 #define RXKAD_VERSION                  2
@@ -915,7 +916,7 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn,
                issue = be32_to_cpu(stamp);
        }
        p += 4;
-       now = xtime.tv_sec;
+       now = get_seconds();
        _debug("KIV ISSUE: %lx [%lx]", issue, now);
 
        /* check the ticket is in date */