diff options
author | 2019-02-11 09:26:45 +0100 | |
---|---|---|
committer | 2019-02-11 09:26:45 +0100 | |
commit | c744ca39f28f9a1e94a62ba02483619925d25ddc (patch) | |
tree | bfcd445d31c88130cb0833675e2c7ea1c40f47e0 /drivers/net/wan/dscc4.c | |
parent | serial: max310x: Correction of the initial setting of the MODE1 bits for various supported ICs. (diff) | |
parent | Linux 5.0-rc6 (diff) | |
download | wireguard-linux-c744ca39f28f9a1e94a62ba02483619925d25ddc.tar.xz wireguard-linux-c744ca39f28f9a1e94a62ba02483619925d25ddc.zip |
Merge 5.0-rc6 into tty-next
We need the tty fixes in here for other patches to be based on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wan/dscc4.c')
-rw-r--r-- | drivers/net/wan/dscc4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index c0b0f525c87c..27decf8ae840 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -1575,7 +1575,7 @@ try: dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; } - dev_kfree_skb_irq(skb); + dev_consume_skb_irq(skb); dpriv->tx_skbuff[cur] = NULL; ++dpriv->tx_dirty; } else { |