Merge tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / core / scm.c

diff --git a/net/core/scm.c b/net/core/scm.c
index b442e7e25e601b19a8237d1a90efbaa1d572fc19..3b6899b7d810d569057b051162b51fde7c51cba8 100644 (file)
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -129,8 +129,7 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
        struct cmsghdr *cmsg;
        int err;
 
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg))
-       {
+       for_each_cmsghdr(cmsg, msg) {
                err = -EINVAL;
 
                /* Verify that cmsg_len is at least sizeof(struct cmsghdr) */