From f7f5218462bb214475c7da2530de85b138f916de Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>
Date: Sun, 7 Aug 2011 09:16:09 +0000
Subject: [PATCH] --- yaml --- r: 262771 b: refs/heads/master c:
 47670b767b1593433b516df7798df03f858278be h: refs/heads/master i:   262769:
 36784753ac4dcb275c8f549e18129b1d7d1eb3e6   262767:
 1795e2e19e9642634ea5da626eb6d59fb03840a5 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/inet_sock.h | 2 +-
 trunk/net/ipv4/raw.c          | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8ebe78d9d1e6..a4c5d26723a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 797fd3913abf2f7036003ab8d3d019cbea41affd
+refs/heads/master: 47670b767b1593433b516df7798df03f858278be
diff --git a/trunk/include/net/inet_sock.h b/trunk/include/net/inet_sock.h
index caaff5f5f39f..b897d6e6d0a5 100644
--- a/trunk/include/net/inet_sock.h
+++ b/trunk/include/net/inet_sock.h
@@ -238,7 +238,7 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 {
 	__u8 flags = 0;
 
-	if (inet_sk(sk)->transparent)
+	if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl)
 		flags |= FLOWI_FLAG_ANYSRC;
 	if (sk->sk_protocol == IPPROTO_TCP)
 		flags |= FLOWI_FLAG_PRECOW_METRICS;
diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c
index 1457acb39cec..61714bd52925 100644
--- a/trunk/net/ipv4/raw.c
+++ b/trunk/net/ipv4/raw.c
@@ -563,7 +563,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
 			   RT_SCOPE_UNIVERSE,
 			   inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
-			   FLOWI_FLAG_CAN_SLEEP, daddr, saddr, 0, 0);
+			   inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP,
+			   daddr, saddr, 0, 0);
 
 	if (!inet->hdrincl) {
 		err = raw_probe_proto_opt(&fl4, msg);