Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / net / ipv4 / ip_sockglue.c

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 71a52f4d4cffba2db9353f43dc817689bf4fab10..af4919792b6a812041dcb18ff30aa8b27482c7a2 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -284,9 +284,12 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
                        ipc->ttl = val;
                        break;
                case IP_TOS:
-                       if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))
+                       if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)))
+                               val = *(int *)CMSG_DATA(cmsg);
+                       else if (cmsg->cmsg_len == CMSG_LEN(sizeof(u8)))
+                               val = *(u8 *)CMSG_DATA(cmsg);
+                       else
                                return -EINVAL;
-                       val = *(int *)CMSG_DATA(cmsg);
                        if (val < 0 || val > 255)
                                return -EINVAL;
                        ipc->tos = val;