patch-2.1.22 linux/net/ipv6/raw.c

• Lines: 27
• Date: Sun Jan 19 15:47:28 1997
• Orig file: v2.1.21/linux/net/ipv6/raw.c
• Orig date: Wed Jan 15 19:45:47 1997

diff -u --recursive --new-file v2.1.21/linux/net/ipv6/raw.c linux/net/ipv6/raw.c
@@ -150,16 +150,7 @@
 	}
 
 	if (msg->msg_controllen)
-	{
-		int err;
-
-		err = datagram_recv_ctl(sk, msg, skb);
-
-		if (err < 0)
-		{
-			copied = err;
-		}
-	}
+		datagram_recv_ctl(sk, msg, skb);
 
 	skb_free_datagram(sk, skb);
 	return (copied);
@@ -311,7 +302,7 @@
 	if (len + (sk->ip_hdrincl ? 0 : sizeof(struct ipv6hdr)) > 65535)
 		return -EMSGSIZE;
 
-	if (msg->msg_control)
+	if (msg->msg_controllen)
 	{
 		opt = &opt_space;
 		memset(opt, 0, sizeof(struct ipv6_options));