Merge tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[firefly-linux-kernel-4.4.55.git] / net / dccp / proto.c

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 19f0387390879cca24873e736f6879245e56e575..e171b780b499dabc7d7312bb3aadbbe4b005f2bd 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -703,7 +703,7 @@ EXPORT_SYMBOL_GPL(compat_dccp_getsockopt);
 
 static int dccp_msghdr_parse(struct msghdr *msg, struct sk_buff *skb)
 {
-       struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);
+       struct cmsghdr *cmsg;
 
        /*
         * Assign an (opaque) qpolicy priority value to skb->priority.
@@ -717,8 +717,7 @@ static int dccp_msghdr_parse(struct msghdr *msg, struct sk_buff *skb)
         */
        skb->priority = 0;
 
-       for (; cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-
+       for_each_cmsghdr(cmsg, msg) {
                if (!CMSG_OK(msg, cmsg))
                        return -EINVAL;