diff options
| author | Julian Wiedmann | 2018-07-11 17:42:41 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-13 01:42:39 +0200 |
| commit | 86c0cdb9e0a5d15f908438bf0491192b35db0869 (patch) | |
| tree | 7187f4ea2cf4a29f256e7d8f0925df392d571fae /drivers/s390/net/qeth_core_main.c | |
| parent | s390/qeth: fine-tune RX modesetting (diff) | |
| download | kernel-qcow2-linux-86c0cdb9e0a5d15f908438bf0491192b35db0869.tar.gz kernel-qcow2-linux-86c0cdb9e0a5d15f908438bf0491192b35db0869.tar.xz kernel-qcow2-linux-86c0cdb9e0a5d15f908438bf0491192b35db0869.zip | |
s390/qeth: clean up Output Queue selection
Consolidate duplicated code, fix the misuse of RTN_UNSPEC and simplify
the handling of non-unicast traffic on IQD devices.
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_core_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index cfe68e3bfe7a..e8b18a9e07d7 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -1537,8 +1537,6 @@ static void qeth_determine_card_type(struct qeth_card *card) card->qdio.default_out_queue = QETH_DEFAULT_QUEUE; card->info.type = CARD_RDEV(card)->id.driver_info; card->qdio.no_out_queues = QETH_MAX_QUEUES; - if (card->info.type == QETH_CARD_TYPE_IQD) - card->info.is_multicast_different = 0x0103; qeth_update_from_chp_desc(card); } @@ -3777,15 +3775,11 @@ static inline int qeth_cut_iqd_prio(struct qeth_card *card, int queue_num) * Note: Function assumes that we have 4 outbound queues. */ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb, - int ipv, int cast_type) + int ipv) { __be16 *tci; u8 tos; - if (cast_type && card->info.is_multicast_different) - return card->info.is_multicast_different & - (card->qdio.no_out_queues - 1); - switch (card->qdio.do_prio_queueing) { case QETH_PRIO_Q_ING_TOS: case QETH_PRIO_Q_ING_PREC: |