diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-05 14:08:14 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-05 14:08:14 -0700 |
| commit | 34069d12e239ae8f36dd96c378e4622fb1c42a76 (patch) | |
| tree | b33fabf1a4cc7530e93ab416f3156bdfe601a3a0 /include/trace/events/net.h | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
| parent | 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff) | |
Merge tag 'v6.5' into next
Sync up with mainline to bring in updates to the shared infrastructure.
Diffstat (limited to 'include/trace/events/net.h')
| -rw-r--r-- | include/trace/events/net.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/net.h b/include/trace/events/net.h index da611a7aaf97..f667c76a3b02 100644 --- a/include/trace/events/net.h +++ b/include/trace/events/net.h @@ -51,7 +51,8 @@ TRACE_EVENT(net_dev_start_xmit, __entry->network_offset = skb_network_offset(skb); __entry->transport_offset_valid = skb_transport_header_was_set(skb); - __entry->transport_offset = skb_transport_offset(skb); + __entry->transport_offset = skb_transport_header_was_set(skb) ? + skb_transport_offset(skb) : 0; __entry->tx_flags = skb_shinfo(skb)->tx_flags; __entry->gso_size = skb_shinfo(skb)->gso_size; __entry->gso_segs = skb_shinfo(skb)->gso_segs; |