From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 26 Oct 2023 20:42:19 +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=ec4c20ca09831ddba8fac10a7d82a9902e96e717;p=linux.git

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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/mac80211/rx.c
  91535613b609 ("wifi: mac80211: don't drop all unprotected public action frames")
  6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value")

Adjacent changes:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c
  61471264c018 ("net: ethernet: apm: Convert to platform remove callback returning void")
  d2ca43f30611 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF")

net/vmw_vsock/virtio_transport.c
  64c99d2d6ada ("vsock/virtio: support to send non-linear skb")
  53b08c498515 ("vsock/virtio: initialize the_virtio_vsock before using VQs")

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

ec4c20ca09831ddba8fac10a7d82a9902e96e717
diff --cc net/mac80211/rx.c
index 051db97a92b40,8f6b6f56b65b4..2d48485142bb5
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@@ -2469,15 -2468,14 +2469,14 @@@ ieee80211_drop_unencrypted_mgmt(struct 
  
  		/* drop unicast public action frames when using MPF */
  		if (is_unicast_ether_addr(mgmt->da) &&
- 		    ieee80211_is_public_action((void *)rx->skb->data,
- 					       rx->skb->len))
+ 		    ieee80211_is_protected_dual_of_public_action(rx->skb))
 -			return -EACCES;
 +			return RX_DROP_U_UNPROT_UNICAST_PUB_ACTION;
  	}
  
 -	return 0;
 +	return RX_CONTINUE;
  }
  
 -static int
 +static ieee80211_rx_result
  __ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
  {
  	struct ieee80211_sub_if_data *sdata = rx->sdata;
diff --cc net/vmw_vsock/virtio_transport.c
index d324ae13e2f5a,b80bf681327bd..af5bab1acee17
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@@ -745,10 -677,8 +759,11 @@@ static int virtio_vsock_probe(struct vi
  	if (ret < 0)
  		goto out;
  
 +	for (i = 0; i < ARRAY_SIZE(vsock->out_sgs); i++)
 +		vsock->out_sgs[i] = &vsock->out_bufs[i];
 +
  	rcu_assign_pointer(the_virtio_vsock, vsock);
+ 	virtio_vsock_vqs_start(vsock);
  
  	mutex_unlock(&the_virtio_vsock_mutex);