diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-04-08 09:24:23 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-04-08 09:24:23 +0300 |
commit | dc2e0617f1fd0c5a6f601502b4379113a84ffecf (patch) | |
tree | d6959aa21296841b6ec543291cd66ed66a6e5c33 /drivers/net/slip/slip.c | |
parent | 27a5a5685d373cd8c18b1d83f42a83e5a2f93e6c (diff) | |
parent | 73b193f265096080eac866b9a852627b475384fc (diff) | |
download | linux-dc2e0617f1fd0c5a6f601502b4379113a84ffecf.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/slip/slip.c')
-rw-r--r-- | drivers/net/slip/slip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c index 88396ff99f03..6865d32270e5 100644 --- a/drivers/net/slip/slip.c +++ b/drivers/net/slip/slip.c @@ -469,7 +469,7 @@ static void sl_tx_timeout(struct net_device *dev, unsigned int txqueue) spin_lock(&sl->lock); if (netif_queue_stopped(dev)) { - if (!netif_running(dev)) + if (!netif_running(dev) || !sl->tty) goto out; /* May be we must check transmitter timeout here ? |