5 files changed, 18 insertions, 9 deletions

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index d79892782a2b..e7e99e6cad21 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -188,8 +188,7 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa,
                 qeth_is_enabled6(c, f) : qeth_is_enabled(c, f))
 
 #define QETH_IDX_FUNC_LEVEL_OSD          0x0101
-#define QETH_IDX_FUNC_LEVEL_IQD_ENA_IPAT 0x4108
-#define QETH_IDX_FUNC_LEVEL_IQD_DIS_IPAT 0x5108
+#define QETH_IDX_FUNC_LEVEL_IQD          0x4108
 
 #define QETH_MODELLIST_ARRAY \
         {{0x1731, 0x01, 0x1732, QETH_CARD_TYPE_OSD, QETH_MAX_QUEUES, 0}, \
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index b7019066c303..844935fbe6a8 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1383,12 +1383,7 @@ static void qeth_init_func_level(struct qeth_card *card)
 {
         switch (card->info.type) {
         case QETH_CARD_TYPE_IQD:
-                if (card->ipato.enabled)
-                        card->info.func_level =
-                                QETH_IDX_FUNC_LEVEL_IQD_ENA_IPAT;
-                else
-                        card->info.func_level =
-                                QETH_IDX_FUNC_LEVEL_IQD_DIS_IPAT;
+                card->info.func_level = QETH_IDX_FUNC_LEVEL_IQD;
                 break;
         case QETH_CARD_TYPE_OSD:
         case QETH_CARD_TYPE_OSN:
diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h
index 8447d233d0b3..e705b27ec7dc 100644
--- a/drivers/s390/net/qeth_l3.h
+++ b/drivers/s390/net/qeth_l3.h
@@ -64,5 +64,6 @@ void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions,
                         const u8 *);
 int qeth_l3_set_large_send(struct qeth_card *, enum qeth_large_send_types);
 int qeth_l3_set_rx_csum(struct qeth_card *, enum qeth_checksum_types);
+int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *, struct qeth_ipaddr *);
 
 #endif /* __QETH_L3_H__ */
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 61d348e51920..15b5ca82bd26 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -195,7 +195,7 @@ static void qeth_l3_convert_addr_to_bits(u8 *addr, u8 *bits, int len)
         }
 }
 
-static int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
+int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
                                                 struct qeth_ipaddr *addr)
 {
         struct qeth_ipato_entry *ipatoe;
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index fb5318b30e99..67cfa68dcf1b 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -479,6 +479,7 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
+        struct qeth_ipaddr *tmpipa, *t;
         char *tmp;
         int rc = 0;
 
@@ -497,8 +498,21 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
                 card->ipato.enabled = (card->ipato.enabled)? 0 : 1;
         } else if (!strcmp(tmp, "1")) {
                 card->ipato.enabled = 1;
+                list_for_each_entry_safe(tmpipa, t, card->ip_tbd_list, entry) {
+                        if ((tmpipa->type == QETH_IP_TYPE_NORMAL) &&
+                                qeth_l3_is_addr_covered_by_ipato(card, tmpipa))
+                                tmpipa->set_flags |=
+                                        QETH_IPA_SETIP_TAKEOVER_FLAG;
+                }
+
         } else if (!strcmp(tmp, "0")) {
                 card->ipato.enabled = 0;
+                list_for_each_entry_safe(tmpipa, t, card->ip_tbd_list, entry) {
+                        if (tmpipa->set_flags &
+                                QETH_IPA_SETIP_TAKEOVER_FLAG)
+                                tmpipa->set_flags &=
+                                        ~QETH_IPA_SETIP_TAKEOVER_FLAG;
+                }
         } else
                 rc = -EINVAL;
 out: