7 files changed, 34 insertions, 36 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index f4d2e9e3c6d5..c3f1afd86906 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -2197,13 +2197,13 @@ static int ixgbe_get_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
         union ixgbe_atr_input *mask = &adapter->fdir_mask;
         struct ethtool_rx_flow_spec *fsp =
                 (struct ethtool_rx_flow_spec *)&cmd->fs;
-        struct hlist_node *node, *node2;
+        struct hlist_node *node2;
         struct ixgbe_fdir_filter *rule = NULL;
 
         /* report total rule count */
         cmd->data = (1024 << adapter->fdir_pballoc) - 2;
 
-        hlist_for_each_entry_safe(rule, node, node2,
+        hlist_for_each_entry_safe(rule, node2,
                                   &adapter->fdir_filter_list, fdir_node) {
                 if (fsp->location <= rule->sw_idx)
                         break;
@@ -2264,14 +2264,14 @@ static int ixgbe_get_ethtool_fdir_all(struct ixgbe_adapter *adapter,
                                       struct ethtool_rxnfc *cmd,
                                       u32 *rule_locs)
 {
-        struct hlist_node *node, *node2;
+        struct hlist_node *node2;
         struct ixgbe_fdir_filter *rule;
         int cnt = 0;
 
         /* report total rule count */
         cmd->data = (1024 << adapter->fdir_pballoc) - 2;
 
-        hlist_for_each_entry_safe(rule, node, node2,
+        hlist_for_each_entry_safe(rule, node2,
                                   &adapter->fdir_filter_list, fdir_node) {
                 if (cnt == cmd->rule_cnt)
                         return -EMSGSIZE;
@@ -2358,19 +2358,19 @@ static int ixgbe_update_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
                                            u16 sw_idx)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-        struct hlist_node *node, *node2, *parent;
-        struct ixgbe_fdir_filter *rule;
+        struct hlist_node *node2;
+        struct ixgbe_fdir_filter *rule, *parent;
         int err = -EINVAL;
 
         parent = NULL;
         rule = NULL;
 
-        hlist_for_each_entry_safe(rule, node, node2,
+        hlist_for_each_entry_safe(rule, node2,
                                   &adapter->fdir_filter_list, fdir_node) {
                 /* hash found, or no matching entry */
                 if (rule->sw_idx >= sw_idx)
                         break;
-                parent = node;
+                parent = rule;
         }
 
         /* if there is an old rule occupying our place remove it */
@@ -2399,7 +2399,7 @@ static int ixgbe_update_ethtool_fdir_entry(struct ixgbe_adapter *adapter,
 
         /* add filter to the list */
         if (parent)
-                hlist_add_after(parent, &input->fdir_node);
+                hlist_add_after(&parent->fdir_node, &input->fdir_node);
         else
                 hlist_add_head(&input->fdir_node,
                                &adapter->fdir_filter_list);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 68478d6dfa2d..db5611ae407e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3891,7 +3891,7 @@ static void ixgbe_configure_pb(struct ixgbe_adapter *adapter)
 static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-        struct hlist_node *node, *node2;
+        struct hlist_node *node2;
         struct ixgbe_fdir_filter *filter;
 
         spin_lock(&adapter->fdir_perfect_lock);
@@ -3899,7 +3899,7 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)
         if (!hlist_empty(&adapter->fdir_filter_list))
                 ixgbe_fdir_set_input_mask_82599(hw, &adapter->fdir_mask);
 
-        hlist_for_each_entry_safe(filter, node, node2,
+        hlist_for_each_entry_safe(filter, node2,
                                   &adapter->fdir_filter_list, fdir_node) {
                 ixgbe_fdir_write_perfect_filter_82599(hw,
                                 &filter->filter,
@@ -4356,12 +4356,12 @@ static void ixgbe_clean_all_tx_rings(struct ixgbe_adapter *adapter)
 
 static void ixgbe_fdir_filter_exit(struct ixgbe_adapter *adapter)
 {
-        struct hlist_node *node, *node2;
+        struct hlist_node *node2;
         struct ixgbe_fdir_filter *filter;
 
         spin_lock(&adapter->fdir_perfect_lock);
 
-        hlist_for_each_entry_safe(filter, node, node2,
+        hlist_for_each_entry_safe(filter, node2,
                                   &adapter->fdir_filter_list, fdir_node) {
                 hlist_del(&filter->fdir_node);
                 kfree(filter);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 5385474bb526..bb4d8d99f36d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -225,11 +225,10 @@ static inline struct mlx4_en_filter *
 mlx4_en_filter_find(struct mlx4_en_priv *priv, __be32 src_ip, __be32 dst_ip,
                     __be16 src_port, __be16 dst_port)
 {
-        struct hlist_node *elem;
         struct mlx4_en_filter *filter;
         struct mlx4_en_filter *ret = NULL;
 
-        hlist_for_each_entry(filter, elem,
+        hlist_for_each_entry(filter,
                              filter_hash_bucket(priv, src_ip, dst_ip,
                                                 src_port, dst_port),
                              filter_chain) {
@@ -574,13 +573,13 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv)
 
         if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {
                 struct mlx4_mac_entry *entry;
-                struct hlist_node *n, *tmp;
+                struct hlist_node *tmp;
                 struct hlist_head *bucket;
                 unsigned int mac_hash;
 
                 mac_hash = priv->dev->dev_addr[MLX4_EN_MAC_HASH_IDX];
                 bucket = &priv->mac_hash[mac_hash];
-                hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+                hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
                         if (ether_addr_equal_64bits(entry->mac,
                                                     priv->dev->dev_addr)) {
                                 en_dbg(DRV, priv, "Releasing qp: port %d, MAC %pM, qpn %d\n",
@@ -609,11 +608,11 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn,
                 struct hlist_head *bucket;
                 unsigned int mac_hash;
                 struct mlx4_mac_entry *entry;
-                struct hlist_node *n, *tmp;
+                struct hlist_node *tmp;
                 u64 prev_mac_u64 = mlx4_en_mac_to_u64(prev_mac);
 
                 bucket = &priv->mac_hash[prev_mac[MLX4_EN_MAC_HASH_IDX]];
-                hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+                hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
                         if (ether_addr_equal_64bits(entry->mac, prev_mac)) {
                                 mlx4_en_uc_steer_release(priv, entry->mac,
                                                          qpn, entry->reg_id);
@@ -1019,7 +1018,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
 {
         struct netdev_hw_addr *ha;
         struct mlx4_mac_entry *entry;
-        struct hlist_node *n, *tmp;
+        struct hlist_node *tmp;
         bool found;
         u64 mac;
         int err = 0;
@@ -1035,7 +1034,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
         /* find what to remove */
         for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {
                 bucket = &priv->mac_hash[i];
-                hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist) {
+                hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
                         found = false;
                         netdev_for_each_uc_addr(ha, dev) {
                                 if (ether_addr_equal_64bits(entry->mac,
@@ -1078,7 +1077,7 @@ static void mlx4_en_do_uc_filter(struct mlx4_en_priv *priv,
         netdev_for_each_uc_addr(ha, dev) {
                 found = false;
                 bucket = &priv->mac_hash[ha->addr[MLX4_EN_MAC_HASH_IDX]];
-                hlist_for_each_entry(entry, n, bucket, hlist) {
+                hlist_for_each_entry(entry, bucket, hlist) {
                         if (ether_addr_equal_64bits(entry->mac, ha->addr)) {
                                 found = true;
                                 break;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index ce38654bbdd0..c7f856308e1a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 #include <linux/mlx4/qp.h>
 #include <linux/skbuff.h>
+#include <linux/rculist.h>
 #include <linux/if_ether.h>
 #include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
@@ -617,7 +618,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
 
                         if (is_multicast_ether_addr(ethh->h_dest)) {
                                 struct mlx4_mac_entry *entry;
-                                struct hlist_node *n;
                                 struct hlist_head *bucket;
                                 unsigned int mac_hash;
 
@@ -625,7 +625,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                                 mac_hash = ethh->h_source[MLX4_EN_MAC_HASH_IDX];
                                 bucket = &priv->mac_hash[mac_hash];
                                 rcu_read_lock();
-                                hlist_for_each_entry_rcu(entry, n, bucket, hlist) {
+                                hlist_for_each_entry_rcu(entry, bucket, hlist) {
                                         if (ether_addr_equal_64bits(entry->mac,
                                                                     ethh->h_source)) {
                                                 rcu_read_unlock();
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index 325e11e1ce0f..f89cc7a3fe6c 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -576,7 +576,7 @@ void qlcnic_free_mac_list(struct qlcnic_adapter *adapter)
 void qlcnic_prune_lb_filters(struct qlcnic_adapter *adapter)
 {
         struct qlcnic_filter *tmp_fil;
-        struct hlist_node *tmp_hnode, *n;
+        struct hlist_node *n;
         struct hlist_head *head;
         int i;
         unsigned long time;
@@ -584,7 +584,7 @@ void qlcnic_prune_lb_filters(struct qlcnic_adapter *adapter)
 
         for (i = 0; i < adapter->fhash.fbucket_size; i++) {
                 head = &(adapter->fhash.fhead[i]);
-                hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode) {
+                hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
                         cmd =  tmp_fil->vlan_id ? QLCNIC_MAC_VLAN_DEL :
                                                   QLCNIC_MAC_DEL;
                         time = tmp_fil->ftime;
@@ -604,7 +604,7 @@ void qlcnic_prune_lb_filters(struct qlcnic_adapter *adapter)
         for (i = 0; i < adapter->rx_fhash.fbucket_size; i++) {
                 head = &(adapter->rx_fhash.fhead[i]);
 
-                hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode)
+                hlist_for_each_entry_safe(tmp_fil, n, head, fnode)
                 {
                         time = tmp_fil->ftime;
                         if (jiffies > (QLCNIC_FILTER_AGE * HZ + time)) {
@@ -621,14 +621,14 @@ void qlcnic_prune_lb_filters(struct qlcnic_adapter *adapter)
 void qlcnic_delete_lb_filters(struct qlcnic_adapter *adapter)
 {
         struct qlcnic_filter *tmp_fil;
-        struct hlist_node *tmp_hnode, *n;
+        struct hlist_node *n;
         struct hlist_head *head;
         int i;
         u8 cmd;
 
         for (i = 0; i < adapter->fhash.fbucket_size; i++) {
                 head = &(adapter->fhash.fhead[i]);
-                hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode) {
+                hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
                         cmd =  tmp_fil->vlan_id ? QLCNIC_MAC_VLAN_DEL :
                                                   QLCNIC_MAC_DEL;
                         qlcnic_sre_macaddr_change(adapter,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 6387e0cc3ea9..0e630061bff3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -162,7 +162,7 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
 {
         struct ethhdr *phdr = (struct ethhdr *)(skb->data);
         struct qlcnic_filter *fil, *tmp_fil;
-        struct hlist_node *tmp_hnode, *n;
+        struct hlist_node *n;
         struct hlist_head *head;
         unsigned long time;
         u64 src_addr = 0;
@@ -179,7 +179,7 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
                          (adapter->fhash.fbucket_size - 1);
                 head = &(adapter->rx_fhash.fhead[hindex]);
 
-                hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode) {
+                hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
                         if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
                             tmp_fil->vlan_id == vlan_id) {
                                 time = tmp_fil->ftime;
@@ -205,7 +205,7 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
                          (adapter->fhash.fbucket_size - 1);
                 head = &(adapter->rx_fhash.fhead[hindex]);
                 spin_lock(&adapter->rx_mac_learn_lock);
-                hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode) {
+                hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
                         if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
                             tmp_fil->vlan_id == vlan_id) {
                                 found = 1;
@@ -272,7 +272,7 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
                                struct sk_buff *skb)
 {
         struct qlcnic_filter *fil, *tmp_fil;
-        struct hlist_node *tmp_hnode, *n;
+        struct hlist_node *n;
         struct hlist_head *head;
         struct net_device *netdev = adapter->netdev;
         struct ethhdr *phdr = (struct ethhdr *)(skb->data);
@@ -294,7 +294,7 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
         hindex = qlcnic_mac_hash(src_addr) & (adapter->fhash.fbucket_size - 1);
         head = &(adapter->fhash.fhead[hindex]);
 
-        hlist_for_each_entry_safe(tmp_fil, tmp_hnode, n, head, fnode) {
+        hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
                 if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
                     tmp_fil->vlan_id == vlan_id) {
                         if (jiffies > (QLCNIC_READD_AGE * HZ + tmp_fil->ftime))
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 289b4eefb42f..1df0ff3839e8 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -614,10 +614,9 @@ struct vnet_port *__tx_port_find(struct vnet *vp, struct sk_buff *skb)
 {
         unsigned int hash = vnet_hashfn(skb->data);
         struct hlist_head *hp = &vp->port_hash[hash];
-        struct hlist_node *n;
         struct vnet_port *port;
 
-        hlist_for_each_entry(port, n, hp, hash) {
+        hlist_for_each_entry(port, hp, hash) {
                 if (ether_addr_equal(port->raddr, skb->data))
                         return port;
         }