From 5be8da73aeacc239d8305c0d03d3ccb682b7627f Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Wed, 4 Jun 2008 15:49:06 +0400 Subject: [PATCH] --- yaml --- r: 97667 b: refs/heads/master c: 49d074f4009a7b5ce9c17b040f978abcb4d7f6f6 h: refs/heads/master i: 97665: 81eb9c4096d9605feb16de1203b51149dea6388f 97663: 1c219ddfeefcf5ab3667da354a130aa84329808e v: v3 --- [refs] | 2 +- trunk/net/ipv6/ipv6_sockglue.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9bb44f367388..13efeb1ebb55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91e1908f569dd96a25a3947de8771e6cc93999dd +refs/heads/master: 49d074f4009a7b5ce9c17b040f978abcb4d7f6f6 diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c index 3eef8e5b3636..1afe210d6286 100644 --- a/trunk/net/ipv6/ipv6_sockglue.c +++ b/trunk/net/ipv6/ipv6_sockglue.c @@ -161,6 +161,9 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, struct ipv6_txoptions *opt; struct sk_buff *pktopt; + if (sk->sk_type == SOCK_RAW) + break; + if (sk->sk_protocol != IPPROTO_UDP && sk->sk_protocol != IPPROTO_UDPLITE && sk->sk_protocol != IPPROTO_TCP)