diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-24 11:24:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-24 11:24:36 -0700 |
| commit | abe90454f0759d6e0b4b70b8b4ea9c5cd0ce8f93 (patch) | |
| tree | 15f04957a1073dfa8bfc34ee2afd9cfd518d3cc6 /drivers | |
| parent | ede285b105d3f3c87edc47ff4d76c6d8cb228382 (diff) | |
| parent | b17233d385d0b6b43ecf81d43008cb1bbb008166 (diff) | |
Merge tag 'linux-can-fixes-for-5.13-20210624' of git://git.kernel.org/
pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2021-06-24
this is a pull request of 2 patches for net/master.
The first patch is by Norbert Slusarek and prevent allocation of
filter for optlen == 0 in the j1939 CAN protocol.
The last patch is by Stephane Grosjean and fixes a potential
starvation in the TX path of the peak_pciefd driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/peak_canfd/peak_canfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/peak_canfd/peak_canfd.c b/drivers/net/can/peak_canfd/peak_canfd.c index 00847cbaf7b6..d08718e98e11 100644 --- a/drivers/net/can/peak_canfd/peak_canfd.c +++ b/drivers/net/can/peak_canfd/peak_canfd.c @@ -351,8 +351,8 @@ static int pucan_handle_status(struct peak_canfd_priv *priv, return err; } - /* start network queue (echo_skb array is empty) */ - netif_start_queue(ndev); + /* wake network queue up (echo_skb array is empty) */ + netif_wake_queue(ndev); return 0; } |