linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / net / scm.h

diff --git a/include/net/scm.h b/include/net/scm.h
index 540619c..c3fa3d5 100644 (file)
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -37,12 +37,10 @@ static __inline__ void scm_destroy(struct scm_cookie *scm)
 static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
                               struct scm_cookie *scm)
 {
-       struct task_struct *p = current;
-       scm->creds.uid = p->uid;
-       scm->creds.gid = p->gid;
-       scm->creds.pid = p->tgid;
-       scm->fp = NULL;
-       scm->seq = 0;
+       memset(scm, 0, sizeof(*scm));
+       scm->creds.uid = current->uid;
+       scm->creds.gid = current->gid;
+       scm->creds.pid = current->tgid;
        if (msg->msg_controllen <= 0)
                return 0;
        return __scm_send(sock, msg, scm);