diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-15 16:57:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-15 16:57:37 +0100 |
| commit | 471864ac8a3274106e0bf3a3e2119c282b76c062 (patch) | |
| tree | 70a78630af16e5374ddfe9f5626750bf8bf60a7f /include/net/llc_pdu.h | |
| parent | 8e8bc5000328a1ba8f93d43faf427e8ac31fb416 (diff) | |
| parent | 41c25e193b2befc22462aa41591d397fab174ca1 (diff) | |
| download | linux-471864ac8a3274106e0bf3a3e2119c282b76c062.tar.gz linux-471864ac8a3274106e0bf3a3e2119c282b76c062.tar.bz2 linux-471864ac8a3274106e0bf3a3e2119c282b76c062.zip | |
Merge branch 'for-linus' into for-next
Pull the latest 6.8 stuff into devel branch for further development.
Fixed the trivial merge conflict for HD-audio Realtek stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/net/llc_pdu.h')
| -rw-r--r-- | include/net/llc_pdu.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h index 7e73f8e5e497..1d55ba7c45be 100644 --- a/include/net/llc_pdu.h +++ b/include/net/llc_pdu.h @@ -262,8 +262,7 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type, */ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) { - if (skb->protocol == htons(ETH_P_802_2)) - memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN); + memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN); } /** @@ -275,8 +274,7 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) */ static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da) { - if (skb->protocol == htons(ETH_P_802_2)) - memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN); + memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN); } /** |