s390/qdio: move SSQD Sniffer mask definition

Put the Sniffer bit next to all the other CHSC AC2 bits.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index e3f238e8c611660be53b9603e1ced4152c669499..71e3f0146cda084920c40b7736c01d45e5b0a594 100644 (file)
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -276,6 +276,7 @@ struct qdio_outbuf_state {
 #define CHSC_AC2_MULTI_BUFFER_AVAILABLE        0x0080
 #define CHSC_AC2_MULTI_BUFFER_ENABLED  0x0040
 #define CHSC_AC2_DATA_DIV_AVAILABLE    0x0010
+#define CHSC_AC2_SNIFFER_AVAILABLE     0x0008
 #define CHSC_AC2_DATA_DIV_ENABLED      0x0002
 
 #define CHSC_AC3_FORMAT2_CQ_AVAILABLE  0x8000

diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h
index 87659cfc90666bd0b4b95e371114621383e1cfdf..2b9302cd0117f89ca83c79f68a96204d1963a5b4 100644 (file)
--- a/drivers/s390/net/qeth_l3.h
+++ b/drivers/s390/net/qeth_l3.h
@@ -13,8 +13,6 @@
 #include "qeth_core.h"
 #include <linux/hashtable.h>
 
-#define QETH_SNIFF_AVAIL       0x0008
-
 enum qeth_ip_types {
        QETH_IP_TYPE_NORMAL,
        QETH_IP_TYPE_VIPA,

diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index 2f73b33c9347e7e8b8cd92991d9edf891f0c7d97..c6204520114e6c264ea88654f324885ad4a2abb2 100644 (file)
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -228,7 +228,7 @@ static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,
                break;
        case 1:
                qdio_get_ssqd_desc(CARD_DDEV(card), &card->ssqd);
-               if (card->ssqd.qdioac2 & QETH_SNIFF_AVAIL) {
+               if (card->ssqd.qdioac2 & CHSC_AC2_SNIFFER_AVAILABLE) {
                        card->options.sniffer = i;
                        if (card->qdio.init_pool.buf_count !=
                                        QETH_IN_BUF_COUNT_MAX)