Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6

[~andy/linux] / include / net / scm.h

diff --git a/include/net/scm.h b/include/net/scm.h
index f45bb6eca7d4263e179a203872c56c87f765ebe5..cf48c800e92636865002755cf76d173c42a746cd 100644 (file)
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -26,7 +26,6 @@ struct scm_cookie
 #ifdef CONFIG_SECURITY_NETWORK
        u32                     secid;          /* Passed security ID   */
 #endif
-       unsigned long           seq;            /* Connection seqno     */
 };
 
 extern void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm);
@@ -59,7 +58,6 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
        scm->creds.gid = current_gid();
        scm->creds.pid = task_tgid_vnr(p);
        scm->fp = NULL;
-       scm->seq = 0;
        unix_get_peersec_dgram(sock, scm);
        if (msg->msg_controllen <= 0)
                return 0;