diff options
| author | David S. Miller | 2019-03-19 02:34:45 +0100 |
|---|---|---|
| committer | David S. Miller | 2019-03-19 02:34:45 +0100 |
| commit | d0645cfdda52aaed609e2d3484130427f8a0db32 (patch) | |
| tree | 3473dc041ea1a079657e48800aacaf630209b7f9 /drivers/s390/net/qeth_l3_main.c | |
| parent | mISDN: hfcpci: Test both vendor & device ID for Digium HFC4S (diff) | |
| parent | s390/qeth: be drop monitor friendly (diff) | |
| download | kernel-qcow2-linux-d0645cfdda52aaed609e2d3484130427f8a0db32.tar.gz kernel-qcow2-linux-d0645cfdda52aaed609e2d3484130427f8a0db32.tar.xz kernel-qcow2-linux-d0645cfdda52aaed609e2d3484130427f8a0db32.zip | |
Merge branch 's390-qeth-fixes'
Julian Wiedmann says:
====================
s390/qeth: fixes 2019-03-18
please apply the following three patches to -net. The first two are fixes
for minor race conditions in the probe code, while the third one gets
dropwatch working (again).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_l3_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 7e68d9d16859..53712cf26406 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -2096,8 +2096,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, tx_drop: QETH_TXQ_STAT_INC(queue, tx_dropped); - QETH_TXQ_STAT_INC(queue, tx_errors); - dev_kfree_skb_any(skb); + kfree_skb(skb); netif_wake_queue(dev); return NETDEV_TX_OK; } @@ -2253,14 +2252,15 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev) struct qeth_card *card = dev_get_drvdata(&gdev->dev); int rc; + hash_init(card->ip_htable); + if (gdev->dev.type == &qeth_generic_devtype) { rc = qeth_l3_create_device_attributes(&gdev->dev); if (rc) return rc; } - hash_init(card->ip_htable); + hash_init(card->ip_mc_htable); - card->info.hwtrap = 0; return 0; } |