diff options
Diffstat (limited to 'drivers/s390/net/qeth_l3_main.c')
-rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 6 |
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) | |||
2711 | rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data); | 2711 | rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data); |
2712 | break; | 2712 | break; |
2713 | case SIOC_QETH_GET_CARD_TYPE: | 2713 | case SIOC_QETH_GET_CARD_TYPE: |
2714 | if ((card->info.type == QETH_CARD_TYPE_OSAE) && | 2714 | if ((card->info.type == QETH_CARD_TYPE_OSD || |
2715 | card->info.type == QETH_CARD_TYPE_OSX) && | ||
2715 | !card->info.guestlan) | 2716 | !card->info.guestlan) |
2716 | return 1; | 2717 | return 1; |
2717 | return 0; | 2718 | return 0; |
@@ -3248,7 +3249,8 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { | |||
3248 | 3249 | ||
3249 | static int qeth_l3_setup_netdev(struct qeth_card *card) | 3250 | static int qeth_l3_setup_netdev(struct qeth_card *card) |
3250 | { | 3251 | { |
3251 | if (card->info.type == QETH_CARD_TYPE_OSAE) { | 3252 | if (card->info.type == QETH_CARD_TYPE_OSD || |
3253 | card->info.type == QETH_CARD_TYPE_OSX) { | ||
3252 | if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) || | 3254 | if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) || |
3253 | (card->info.link_type == QETH_LINK_TYPE_HSTR)) { | 3255 | (card->info.link_type == QETH_LINK_TYPE_HSTR)) { |
3254 | #ifdef CONFIG_TR | 3256 | #ifdef CONFIG_TR |