qeth: support the new OSA CHPID types OSX and OSM

The qeth driver is enabled to support the new OSA CHPID types OSX
and OSM.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 83c7f9444c4f..61adae21a464 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2711,7 +2711,8 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data);
                 break;
         case SIOC_QETH_GET_CARD_TYPE:
-                if ((card->info.type == QETH_CARD_TYPE_OSAE) &&
+                if ((card->info.type == QETH_CARD_TYPE_OSD ||
+                     card->info.type == QETH_CARD_TYPE_OSX) &&
                     !card->info.guestlan)
                         return 1;
                 return 0;
@@ -3248,7 +3249,8 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = {
 
 static int qeth_l3_setup_netdev(struct qeth_card *card)
 {
-        if (card->info.type == QETH_CARD_TYPE_OSAE) {
+        if (card->info.type == QETH_CARD_TYPE_OSD ||
+            card->info.type == QETH_CARD_TYPE_OSX) {
                 if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
                     (card->info.link_type == QETH_LINK_TYPE_HSTR)) {
 #ifdef CONFIG_TR