diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:00:52 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:00:52 +0100 |
| commit | 2d6ce046e22eac405160e071f6c95b5ac6942437 (patch) | |
| tree | 83e885443c4ad3d56d2c692e48863b526b9f3ae2 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
| parent | e60960c4ba278d3bbde28491f97a52b80b3164b5 (diff) | |
| parent | 1d146b1875fc901ae6bfe26ec8fed15b8dcd97ae (diff) | |
Merge tag 'v5.15.144' into fslc-5.15-2.2.x-imx
This is the 5.15.144 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index af824370a2f6..819169eaebe9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -8696,7 +8696,7 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, if (skb_cow_head(skb, 0)) goto out_drop; - vhdr = (struct vlan_ethhdr *)skb->data; + vhdr = skb_vlan_eth_hdr(skb); vhdr->h_vlan_TCI = htons(tx_flags >> IXGBE_TX_FLAGS_VLAN_SHIFT); } else { |