diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-06-26 15:23:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-06-26 15:23:23 +0200 |
| commit | a15b51375684c2bfa6017bb185139477e7a3b96c (patch) | |
| tree | 6a4d7b4e7f09b858782cf2e5c0601d9f778cab15 /net/core/dev.c | |
| parent | e94f1f96f108ba96c0ed8bf3fbdd8ee6a6703880 (diff) | |
| parent | 4e0871333661d2ec0ed3dc00a945c2160eccae77 (diff) | |
Merge branch 'for-next' into for-linus
Pull the 6.5-devel branch for upstreaming.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 735096d42c1d..b3c13e041935 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3335,7 +3335,7 @@ __be16 skb_network_protocol(struct sk_buff *skb, int *depth) type = eth->h_proto; } - return __vlan_get_protocol(skb, type, depth); + return vlan_get_protocol_and_depth(skb, type, depth); } /* openvswitch calls this on rx path, so we need a different check. |