From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 26 May 2023 02:56:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d4031ec844bc52fe7f2f844e9c476727fd6b8240;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/raw.c
  3632679d9e4f ("ipv{4,6}/raw: fix output xfrm lookup wrt protocol")
  c85be08fc4fa ("raw: Stop using RTO_ONLINK.")
https://lore.kernel.org/all/20230525110037.2b532b83@canb.auug.org.au/

Adjacent changes:

drivers/net/ethernet/freescale/fec_main.c
  9025944fddfe ("net: fec: add dma_wmb to ensure correct descriptor values")
  144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

d4031ec844bc52fe7f2f844e9c476727fd6b8240
diff --cc net/ipv4/raw.c
index 8b7b5c842bdd5,eadf1c9ef7e49..9aacce9db7b92
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@@ -596,8 -600,9 +599,8 @@@ static int raw_sendmsg(struct sock *sk
  		}
  	}
  
 -	flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,
 -			   RT_SCOPE_UNIVERSE,
 +	flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos, scope,
- 			   hdrincl ? IPPROTO_RAW : sk->sk_protocol,
+ 			   hdrincl ? ipc.protocol : sk->sk_protocol,
  			   inet_sk_flowi_flags(sk) |
  			    (hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),
  			   daddr, saddr, 0, 0, sk->sk_uid);