s390/qeth: unify RX-mode hashtables

To keep track of the addresses programmed from an RX modeset, we have
two separate hashtables (L2: mac_htable, L3: ip_mc_htable).

These are never used at the same time, so unify them into a single
rx_mode_addrs hashtable.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index c77a87105ea85be306c3ff7b8566f0b1339590a3..3d54c8bbfa86eab1d480064c4f77c443b7c972b9 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -803,14 +803,13 @@ struct qeth_card {
        struct workqueue_struct *event_wq;
        struct workqueue_struct *cmd_wq;
        wait_queue_head_t wait_q;
-       DECLARE_HASHTABLE(mac_htable, 4);
        DECLARE_HASHTABLE(ip_htable, 4);
        DECLARE_HASHTABLE(local_addrs4, 4);
        DECLARE_HASHTABLE(local_addrs6, 4);
        spinlock_t local_addrs4_lock;
        spinlock_t local_addrs6_lock;
        struct mutex ip_lock;
-       DECLARE_HASHTABLE(ip_mc_htable, 4);
+       DECLARE_HASHTABLE(rx_mode_addrs, 4);
        struct work_struct rx_mode_work;
        struct work_struct kernel_thread_starter;
        spinlock_t thread_mask_lock;

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 053a25e34e4bf3b0e553982a3f574a7827741cbe..01a280b5e8d21a05c9d89393374035dfbe224f1a 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1647,6 +1647,7 @@ static void qeth_setup_card(struct qeth_card *card)
        qeth_init_qdio_info(card);
        INIT_DELAYED_WORK(&card->buffer_reclaim_work, qeth_buffer_reclaim_work);
        INIT_WORK(&card->close_dev_work, qeth_close_dev_handler);
+       hash_init(card->rx_mode_addrs);
        hash_init(card->local_addrs4);
        hash_init(card->local_addrs6);
        spin_lock_init(&card->local_addrs4_lock);

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 2d3bca3c0141fabc2abca2c39f44f515356a37ad..ef7a2db7a7245296bf79b905c6b898b6f709f190 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -156,7 +156,7 @@ static void qeth_l2_drain_rx_mode_cache(struct qeth_card *card)
        struct hlist_node *tmp;
        int i;
 
-       hash_for_each_safe(card->mac_htable, i, tmp, mac, hnode) {
+       hash_for_each_safe(card->rx_mode_addrs, i, tmp, mac, hnode) {
                hash_del(&mac->hnode);
                kfree(mac);
        }
@@ -438,7 +438,7 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha)
        u32 mac_hash = get_unaligned((u32 *)(&ha->addr[2]));
        struct qeth_mac *mac;
 
-       hash_for_each_possible(card->mac_htable, mac, hnode, mac_hash) {
+       hash_for_each_possible(card->rx_mode_addrs, mac, hnode, mac_hash) {
                if (ether_addr_equal_64bits(ha->addr, mac->mac_addr)) {
                        mac->disp_flag = QETH_DISP_ADDR_DO_NOTHING;
                        return;
@@ -452,7 +452,7 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha)
        ether_addr_copy(mac->mac_addr, ha->addr);
        mac->disp_flag = QETH_DISP_ADDR_ADD;
 
-       hash_add(card->mac_htable, &mac->hnode, mac_hash);
+       hash_add(card->rx_mode_addrs, &mac->hnode, mac_hash);
 }
 
 static void qeth_l2_rx_mode_work(struct work_struct *work)
@@ -475,7 +475,7 @@ static void qeth_l2_rx_mode_work(struct work_struct *work)
                qeth_l2_add_mac(card, ha);
        netif_addr_unlock_bh(dev);
 
-       hash_for_each_safe(card->mac_htable, i, tmp, mac, hnode) {
+       hash_for_each_safe(card->rx_mode_addrs, i, tmp, mac, hnode) {
                switch (mac->disp_flag) {
                case QETH_DISP_ADDR_DELETE:
                        qeth_l2_remove_mac(card, mac->mac_addr);
@@ -601,7 +601,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
                        return rc;
        }
 
-       hash_init(card->mac_htable);
        INIT_WORK(&card->rx_mode_work, qeth_l2_rx_mode_work);
        return 0;
 }

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index d4ce653ff1118d496fc76b4229c1298d0d35f110..15a12487ff7a3192295bd45d8affe7aaaac11247 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -58,7 +58,7 @@ static struct qeth_ipaddr *qeth_l3_find_addr_by_ip(struct qeth_card *card,
        struct qeth_ipaddr *addr;
 
        if (query->is_multicast) {
-               hash_for_each_possible(card->ip_mc_htable, addr, hnode, key)
+               hash_for_each_possible(card->rx_mode_addrs, addr, hnode, key)
                        if (qeth_l3_addr_match_ip(addr, query))
                                return addr;
        } else {
@@ -239,7 +239,7 @@ static void qeth_l3_drain_rx_mode_cache(struct qeth_card *card)
        struct hlist_node *tmp;
        int i;
 
-       hash_for_each_safe(card->ip_mc_htable, i, tmp, addr, hnode) {
+       hash_for_each_safe(card->rx_mode_addrs, i, tmp, addr, hnode) {
                hash_del(&addr->hnode);
                kfree(addr);
        }
@@ -1093,7 +1093,7 @@ static int qeth_l3_add_mcast_rtnl(struct net_device *dev, int vid, void *arg)
                if (!ipm)
                        continue;
 
-               hash_add(card->ip_mc_htable, &ipm->hnode,
+               hash_add(card->rx_mode_addrs, &ipm->hnode,
                         qeth_l3_ipaddr_hash(ipm));
        }
 
@@ -1124,8 +1124,8 @@ walk_ipv6:
                if (!ipm)
                        continue;
 
-               hash_add(card->ip_mc_htable,
-                               &ipm->hnode, qeth_l3_ipaddr_hash(ipm));
+               hash_add(card->rx_mode_addrs, &ipm->hnode,
+                        qeth_l3_ipaddr_hash(ipm));
 
        }
        read_unlock_bh(&in6_dev->lock);
@@ -1219,7 +1219,7 @@ static void qeth_l3_rx_mode_work(struct work_struct *work)
                        vlan_for_each(card->dev, qeth_l3_add_mcast_rtnl, card);
                rtnl_unlock();
 
-               hash_for_each_safe(card->ip_mc_htable, i, tmp, addr, hnode) {
+               hash_for_each_safe(card->rx_mode_addrs, i, tmp, addr, hnode) {
                        switch (addr->disp_flag) {
                        case QETH_DISP_ADDR_DELETE:
                                rc = qeth_l3_deregister_addr_entry(card, addr);
@@ -1998,7 +1998,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
                }
        }
 
-       hash_init(card->ip_mc_htable);
        INIT_WORK(&card->rx_mode_work, qeth_l3_rx_mode_work);
        return 0;
 }