Skip to content

Commit beb5aec

Browse files
committed
bnx2x: adopt skb_network_header_len() more broadly
JIRA: https://issues.redhat.com/browse/RHEL-52258 JIRA: https://issues.redhat.com/browse/RHEL-52667 Conflicts: Only the bnx2x hunk. commit cc15bd1 Author: Eric Dumazet <edumazet@google.com> Date: Thu Feb 29 09:39:08 2024 +0000 net: adopt skb_network_header_len() more broadly (skb_transport_header(skb) - skb_network_header(skb)) can be replaced by skb_network_header_len(skb) Add a DEBUG_NET_WARN_ON_ONCE() in skb_network_header_len() to catch cases were the transport_header was not set. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
1 parent 722946b commit beb5aec

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3621,8 +3621,7 @@ static u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,
36213621
((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<
36223622
ETH_TX_PARSE_BD_E1X_LLC_SNAP_EN_SHIFT));
36233623

3624-
pbd->ip_hlen_w = (skb_transport_header(skb) -
3625-
skb_network_header(skb)) >> 1;
3624+
pbd->ip_hlen_w = skb_network_header_len(skb) >> 1;
36263625

36273626
hlen += pbd->ip_hlen_w;
36283627

0 commit comments

Comments
 (0)