diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 08:58:33 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 08:58:33 +0300 |
| commit | ff1c0c5d07028a84837950b619d30da623f8ddb2 (patch) | |
| tree | 0dac4e0728613580a935876b3b5ba7ba29f51865 /drivers/net/netdevsim | |
| parent | 09c04714cb455debc1dcc3535b6becb52c5b01e0 (diff) | |
| parent | d6e152d905bdb1f32f9d99775e2f453350399a6a (diff) | |
| download | linux-ff1c0c5d07028a84837950b619d30da623f8ddb2.tar.xz | |
Merge branch 'timers/urgent' into timers/core
to resolve the conflict with urgent fixes.
Diffstat (limited to 'drivers/net/netdevsim')
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 5ec028a00c62..3645ebde049a 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -109,8 +109,11 @@ static int nsim_forward_skb(struct net_device *tx_dev, int ret; ret = __dev_forward_skb(rx_dev, skb); - if (ret) + if (ret) { + if (psp_ext) + __skb_ext_put(psp_ext); return ret; + } nsim_psp_handle_ext(skb, psp_ext); |