Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / net / netlink / af_netlink.c

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 4330db99fabff3457e34c504aad8785fad38cb7f..1201b6d4183d8993b1175119978a3baee4481eec 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1324,10 +1324,9 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
        if (msg->msg_flags&MSG_OOB)
                return -EOPNOTSUPP;
 
-       if (NULL == siocb->scm) {
+       if (NULL == siocb->scm)
                siocb->scm = &scm;
-               memset(&scm, 0, sizeof(scm));
-       }
+
        err = scm_send(sock, msg, siocb->scm);
        if (err < 0)
                return err;