From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 5 Dec 2024 19:48:58 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: block-6.14-20240131~28^2~146
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=385f186aba3d2f7122b71d6d4c7e236b9d4e8003;p=linux-block.git

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

Cross-merge networking fixes after downstream PR (net-6.13-rc6).

No conflicts.

Adjacent changes:

include/linux/if_vlan.h
  f91a5b808938 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK")
  3f330db30638 ("net: reformat kdoc return statements")

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

385f186aba3d2f7122b71d6d4c7e236b9d4e8003
diff --cc include/linux/if_vlan.h
index d6326b53e336,d65b5d71b93b..d495cbdb52cb
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@@ -585,13 -585,16 +585,16 @@@ static inline int vlan_get_tag(const st
   * vlan_get_protocol - get protocol EtherType.
   * @skb: skbuff to query
   * @type: first vlan protocol
+  * @mac_offset: MAC offset
   * @depth: buffer to store length of eth and vlan tags in bytes
   *
 - * Returns the EtherType of the packet, regardless of whether it is
 + * Returns: the EtherType of the packet, regardless of whether it is
   * vlan encapsulated (normal or hardware accelerated) or not.
   */
- static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
- 					 int *depth)
+ static inline __be16 __vlan_get_protocol_offset(const struct sk_buff *skb,
+ 						__be16 type,
+ 						int mac_offset,
+ 						int *depth)
  {
  	unsigned int vlan_depth = skb->mac_len, parse_depth = VLAN_MAX_DEPTH;