diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 09:45:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 09:45:22 -0700 |
| commit | 3674fbf0451df0395f9fa18df3122927006a3829 (patch) | |
| tree | 632690d6c74a7bedb166299bbc92059cd3a537f9 /drivers/net/bonding | |
| parent | 9d797ee2dce1e3e243bcc18dad7728df72fd11a4 (diff) | |
| parent | 25a9c8a4431c364f97f75558cb346d2ad3f53fbb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.5 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 16405b84dc2f..7a0f25301f7e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4200,7 +4200,7 @@ u32 bond_xmit_hash(struct bonding *bond, struct sk_buff *skb) return skb->hash; return __bond_xmit_hash(bond, skb, skb->data, skb->protocol, - skb_mac_offset(skb), skb_network_offset(skb), + 0, skb_network_offset(skb), skb_headlen(skb)); } |