aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_l2_main.c
diff options
context:
space:
mode:
authorJulian Wiedmann <jwi@linux.ibm.com>2018-08-09 08:48:03 -0400
committerDavid S. Miller <davem@davemloft.net>2018-08-09 17:02:50 -0400
commitf15cdaf237e9acc2ee14663ba53b872a27ee7015 (patch)
treee8e6d7aed42ac8f7a8b2da88c6a7e67f9352b676 /drivers/s390/net/qeth_l2_main.c
parent95f4d8b75ad3fb774113450c9788af0dde91a27d (diff)
s390/qeth: don't restrict qeth_card to DMA memory
Allocating the main qeth_card struct with GFP_DMA blocks us from moving it into netdev_priv(). But the only reason why we need DMA memory is the ccw1 structs embedded into each ccw channel. So extract those into separate allocations, like we already do for the cmd buffers. Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_l2_main.c')
-rw-r--r--drivers/s390/net/qeth_l2_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index a86ba45ade05..710fa74892ae 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1250,7 +1250,7 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len,
1250 qeth_prepare_control_data(card, len, iob); 1250 qeth_prepare_control_data(card, len, iob);
1251 QETH_CARD_TEXT(card, 6, "osnoirqp"); 1251 QETH_CARD_TEXT(card, 6, "osnoirqp");
1252 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 1252 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
1253 rc = ccw_device_start_timeout(channel->ccwdev, &channel->ccw, 1253 rc = ccw_device_start_timeout(channel->ccwdev, channel->ccw,
1254 (addr_t) iob, 0, 0, QETH_IPA_TIMEOUT); 1254 (addr_t) iob, 0, 0, QETH_IPA_TIMEOUT);
1255 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); 1255 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
1256 if (rc) { 1256 if (rc) {