s390: qeth bug fixes for 2.6.37 next rc
Subsystems (4)
cover s390: qeth bug fixes for 2.6.37 next rc
Hi Dave,
here are some qeth bug fixes for 2.6.37 next rc (net-2.6)
shortlog:
Ursula Braun (1)
qeth: remove dev_queue_xmit invocation
Frank Blaschka (1)
qeth: fix race condition during device startup
Thanks,
Frank
PATCH 1/2 qeth: remove dev_queue_xmit invocation
From: Ursula Braun <[email protected]>
For a certain Hipersockets specific error code in the xmit path, the qeth driver tries to invoke dev_queue_xmit again.
Commit 79640a4ca6955e3ebdb7038508fa7a0cd7fa5527 introduces a busylock causing locking problems in case of re-invoked dev_queue_xmit by qeth. This patch removes the attempts to retry packet sending with dev_queue_xmit from the qeth driver.
---
drivers/s390/net/qeth_core.h | 9 ------ drivers/s390/net/qeth_core_main.c | 53 +++++--------------------------------- 2 files changed, 8 insertions(+), 54 deletions(-)
drivers/s390/net/qeth_core.h +0 -9
@@ -440,7 +440,6 @@ struct qeth_qdio_out_q {* index of buffer to be filled by driver; state EMPTY or PACKING */ int next_buf_to_fill; -int sync_iqdio_error;/* * number of buffers that are currently filled (PRIMED) * -> these buffers are hardware-owned
@@ -695,14 +694,6 @@ struct qeth_mc_mac {int is_vmac; }; -struct qeth_skb_data { -__u32 magic; -int count; -}; - -#define QETH_SKB_MAGIC 0x71657468 -#define QETH_SIGA_CC2_RETRIES 3 -struct qeth_rx {int b_count;int b_index;
drivers/s390/net/qeth_core_main.c +8 -45
109 lines not on this page · raw message
PATCH 2/2 qeth: fix race condition during device startup
In reply to [email protected]From: Frank Blaschka <[email protected]>
QDIO is running independent from netdevice state. We are not allowed to schedule NAPI in case the netdevice is not open.
---
drivers/s390/net/qeth_core_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_core_main.c +1 -1
@@ -2903,7 +2903,7 @@ void qeth_qdio_start_poll(struct ccw_dev {struct qeth_card *card = (struct qeth_card *)card_ptr; -if (card->dev) +if (card->dev && (card->dev->flags &IFF_UP ))napi_schedule (&card->napi); }EXPORT_SYMBOL_GPL (qeth_qdio_start_poll);