diff options
| author | Thomas Zimmermann <[email protected]> | 2024-07-29 09:35:54 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2024-07-29 09:35:54 +0200 |
| commit | 0e8655b4e852ef97655648b91ce780384a073ff4 (patch) | |
| tree | 11052a81da749dda3357f7748bdf93549c8007bf /include/linux/etherdevice.h | |
| parent | 0c3f3a83c7e8dfaaae4ba8a5b69bd6bc13340d0b (diff) | |
| parent | d4ef5d2b7ee0cbb5f2d864716140366a618400d6 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get a late RC of v6.10 before moving into v6.11.
Signed-off-by: Thomas Zimmermann <[email protected]>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 2ad1ffa4ccb9..0ed47d00549b 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -636,6 +636,14 @@ static inline void eth_skb_pkt_type(struct sk_buff *skb, } } +static inline struct ethhdr *eth_skb_pull_mac(struct sk_buff *skb) +{ + struct ethhdr *eth = (struct ethhdr *)skb->data; + + skb_pull_inline(skb, ETH_HLEN); + return eth; +} + /** * eth_skb_pad - Pad buffer to mininum number of octets for Ethernet frame * @skb: Buffer to pad |