diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2026-05-04 07:14:58 +0200 |
|---|---|---|
| committer | Thomas Weißschuh <linux@weissschuh.net> | 2026-05-04 08:46:43 +0200 |
| commit | bb2d82d41894cb30d836e9796ff67d2f9a71eccf (patch) | |
| tree | 4085a924beaa877dc68346c4baf7f4481fc9f871 /drivers/net/netdevsim | |
| parent | d4fe68aea3d9fa66534dc2485b8ab998514ca0fc (diff) | |
| parent | 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 (diff) | |
Merge tag 'v7.1-rc2' into nolibc/for-next
Pick up commit b0aa5e4b087b ("sh: Fix fallout from ZERO_PAGE
consolidation") to fix the sh4 selftests.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Diffstat (limited to 'drivers/net/netdevsim')
| -rw-r--r-- | drivers/net/netdevsim/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index 1e06e781c835..f00fc2f9ebde 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -829,7 +829,7 @@ static struct sk_buff *nsim_dev_trap_skb_build(void) skb->protocol = htons(ETH_P_IP); skb_set_network_header(skb, skb->len); - iph = skb_put(skb, sizeof(struct iphdr)); + iph = skb_put_zero(skb, sizeof(struct iphdr)); iph->protocol = IPPROTO_UDP; iph->saddr = in_aton("192.0.2.1"); iph->daddr = in_aton("198.51.100.1"); |