s390/qeth: remove support for IPA_IP_FRAGMENTATION

This Assist was never actually implemented in any hardware, so just
remove the leftovers.

Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Reviewed-by: Hans Wippel <hwippel@linux.vnet.ibm.com>
Reviewed-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index fc6d85f2b38d60d4c1b62bd169776d5cfcabcc52..dba7d00715e374cf2d184d985f541c15977cc5ee 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4199,8 +4199,7 @@ int qeth_change_mtu(struct net_device *dev, int new_mtu)
        sprintf(dbf_text, "%8x", new_mtu);
        QETH_CARD_TEXT(card, 4, dbf_text);
 
-       if ((!qeth_is_supported(card, IPA_IP_FRAGMENTATION)) &&
-           (!qeth_mtu_is_valid(card, new_mtu)))
+       if (!qeth_mtu_is_valid(card, new_mtu))
                return -EINVAL;
        dev->mtu = new_mtu;
        return 0;

diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h
index 4accb0a61ce0be1001db084248506f480242cdcd..45bbea2843bfb79c8531cf04c0b127ba039e2e2f 100644 (file)
--- a/drivers/s390/net/qeth_core_mpc.h
+++ b/drivers/s390/net/qeth_core_mpc.h
@@ -192,7 +192,7 @@ enum qeth_ipa_funcs {
        IPA_ARP_PROCESSING      = 0x00000001L,
        IPA_INBOUND_CHECKSUM    = 0x00000002L,
        IPA_OUTBOUND_CHECKSUM   = 0x00000004L,
-       IPA_IP_FRAGMENTATION    = 0x00000008L,
+       /* RESERVED             = 0x00000008L,*/
        IPA_FILTERING           = 0x00000010L,
        IPA_IPV6                = 0x00000020L,
        IPA_MULTICASTING        = 0x00000040L,

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index d8df1e6351636250ea534cf17527c8fb198435f2..ac8310fe2fb055e21ce005b5cfda096f03b6475c 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -956,31 +956,6 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
        return rc;
 }
 
-static int qeth_l3_start_ipa_ip_fragmentation(struct qeth_card *card)
-{
-       int rc;
-
-       QETH_CARD_TEXT(card, 3, "ipaipfrg");
-
-       if (!qeth_is_supported(card, IPA_IP_FRAGMENTATION)) {
-               dev_info(&card->gdev->dev,
-                       "Hardware IP fragmentation not supported on %s\n",
-                       QETH_CARD_IFNAME(card));
-               return  -EOPNOTSUPP;
-       }
-
-       rc = qeth_send_simple_setassparms(card, IPA_IP_FRAGMENTATION,
-                                         IPA_CMD_ASS_START, 0);
-       if (rc) {
-               dev_warn(&card->gdev->dev,
-                       "Starting IP fragmentation support for %s failed\n",
-                       QETH_CARD_IFNAME(card));
-       } else
-               dev_info(&card->gdev->dev,
-                       "Hardware IP fragmentation enabled \n");
-       return rc;
-}
-
 static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
 {
        int rc;
@@ -1171,7 +1146,6 @@ static int qeth_l3_start_ipassists(struct qeth_card *card)
        if (qeth_set_access_ctrl_online(card, 0))
                return -EIO;
        qeth_l3_start_ipa_arp_processing(card); /* go on*/
-       qeth_l3_start_ipa_ip_fragmentation(card);       /* go on*/
        qeth_l3_start_ipa_source_mac(card);     /* go on*/
        qeth_l3_start_ipa_vlan(card);           /* go on*/
        qeth_l3_start_ipa_multicast(card);              /* go on*/