15 files changed, 64 insertions, 110 deletions

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index a7efec293037..9b017d9c58e9 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -381,7 +381,7 @@ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
 }
 
 #ifdef CONFIG_BCM47XX
-#include <asm/mach-bcm47xx/nvram.h>
+#include <bcm47xx_nvram.h>
 static void b44_wap54g10_workaround(struct b44 *bp)
 {
         char buf[20];
@@ -393,7 +393,7 @@ static void b44_wap54g10_workaround(struct b44 *bp)
          * see https://dev.openwrt.org/ticket/146
          * check and reset bit "isolate"
          */
-        if (nvram_getenv("boardnum", buf, sizeof(buf)) < 0)
+        if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) < 0)
                 return;
         if (simple_strtoul(buf, NULL, 0) == 2) {
                 err = __b44_readphy(bp, 0, MII_BMCR, &val);
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index bf985c04524e..639049d7e92d 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -15,7 +15,7 @@
 #include <linux/mii.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
-#include <asm/mach-bcm47xx/nvram.h>
+#include <bcm47xx_nvram.h>
 
 static const struct bcma_device_id bgmac_bcma_tbl[] = {
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
@@ -908,7 +908,7 @@ static void bgmac_chip_reset(struct bgmac *bgmac)
                              BGMAC_CHIPCTL_1_IF_TYPE_RMII;
                 char buf[2];
 
-                if (nvram_getenv("et_swtype", buf, 1) > 0) {
+                if (bcm47xx_nvram_getenv("et_swtype", buf, 1) > 0) {
                         if (kstrtou8(buf, 0, &et_swtype))
                                 bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n",
                                           buf);
@@ -1386,7 +1386,7 @@ static int bgmac_probe(struct bcma_device *core)
         }
 
         bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK;
-        if (nvram_getenv("et0_no_txint", NULL, 0) == 0)
+        if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0)
                 bgmac->int_mask &= ~BGMAC_IS_TX_MASK;
 
         /* TODO: reset the external phy. Specs are needed */
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;
         }
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index defcd8a85744..417b2af1aa80 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -55,9 +55,8 @@ static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
                                                const unsigned char *addr)
 {
         struct macvlan_dev *vlan;
-        struct hlist_node *n;
 
-        hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[addr[5]], hlist) {
+        hlist_for_each_entry_rcu(vlan, &port->vlan_hash[addr[5]], hlist) {
                 if (ether_addr_equal_64bits(vlan->dev->dev_addr, addr))
                         return vlan;
         }
@@ -149,7 +148,6 @@ static void macvlan_broadcast(struct sk_buff *skb,
 {
         const struct ethhdr *eth = eth_hdr(skb);
         const struct macvlan_dev *vlan;
-        struct hlist_node *n;
         struct sk_buff *nskb;
         unsigned int i;
         int err;
@@ -159,7 +157,7 @@ static void macvlan_broadcast(struct sk_buff *skb,
                 return;
 
         for (i = 0; i < MACVLAN_HASH_SIZE; i++) {
-                hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) {
+                hlist_for_each_entry_rcu(vlan, &port->vlan_hash[i], hlist) {
                         if (vlan->dev == src || !(vlan->mode & mode))
                                 continue;
 
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 97243011d319..a449439bd653 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -279,28 +279,17 @@ static int macvtap_receive(struct sk_buff *skb)
 static int macvtap_get_minor(struct macvlan_dev *vlan)
 {
         int retval = -ENOMEM;
-        int id;
 
         mutex_lock(&minor_lock);
-        if (idr_pre_get(&minor_idr, GFP_KERNEL) == 0)
-                goto exit;
-
-        retval = idr_get_new_above(&minor_idr, vlan, 1, &id);
-        if (retval < 0) {
-                if (retval == -EAGAIN)
-                        retval = -ENOMEM;
-                goto exit;
-        }
-        if (id < MACVTAP_NUM_DEVS) {
-                vlan->minor = id;
-        } else {
+        retval = idr_alloc(&minor_idr, vlan, 1, MACVTAP_NUM_DEVS, GFP_KERNEL);
+        if (retval >= 0) {
+                vlan->minor = retval;
+        } else if (retval == -ENOSPC) {
                 printk(KERN_ERR "too many macvtap devices\n");
                 retval = -EINVAL;
-                idr_remove(&minor_idr, id);
         }
-exit:
         mutex_unlock(&minor_lock);
-        return retval;
+        return retval < 0 ? retval : 0;
 }
 
 static void macvtap_free_minor(struct macvlan_dev *vlan)
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 3db9131e9229..72ff14b811c6 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -2953,46 +2953,21 @@ static void __exit ppp_cleanup(void)
  * by holding all_ppp_mutex
  */
 
-static int __unit_alloc(struct idr *p, void *ptr, int n)
-{
-        int unit, err;
-
-again:
-        if (!idr_pre_get(p, GFP_KERNEL)) {
-                pr_err("PPP: No free memory for idr\n");
-                return -ENOMEM;
-        }
-
-        err = idr_get_new_above(p, ptr, n, &unit);
-        if (err < 0) {
-                if (err == -EAGAIN)
-                        goto again;
-                return err;
-        }
-
-        return unit;
-}
-
 /* associate pointer with specified number */
 static int unit_set(struct idr *p, void *ptr, int n)
 {
         int unit;
 
-        unit = __unit_alloc(p, ptr, n);
-        if (unit < 0)
-                return unit;
-        else if (unit != n) {
-                idr_remove(p, unit);
-                return -EINVAL;
-        }
-
+        unit = idr_alloc(p, ptr, n, n + 1, GFP_KERNEL);
+        if (unit == -ENOSPC)
+                unit = -EINVAL;
         return unit;
 }
 
 /* get new free unit number and associate pointer with it */
 static int unit_get(struct idr *p, void *ptr)
 {
-        return __unit_alloc(p, ptr, 0);
+        return idr_alloc(p, ptr, 0, 0, GFP_KERNEL);
 }
 
 /* put unit number back to a pool */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index b6f45c5d84d5..2c6a22e278ea 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -197,9 +197,8 @@ static inline u32 tun_hashfn(u32 rxhash)
 static struct tun_flow_entry *tun_flow_find(struct hlist_head *head, u32 rxhash)
 {
         struct tun_flow_entry *e;
-        struct hlist_node *n;
 
-        hlist_for_each_entry_rcu(e, n, head, hash_link) {
+        hlist_for_each_entry_rcu(e, head, hash_link) {
                 if (e->rxhash == rxhash)
                         return e;
         }
@@ -241,9 +240,9 @@ static void tun_flow_flush(struct tun_struct *tun)
         spin_lock_bh(&tun->lock);
         for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
                 struct tun_flow_entry *e;
-                struct hlist_node *h, *n;
+                struct hlist_node *n;
 
-                hlist_for_each_entry_safe(e, h, n, &tun->flows[i], hash_link)
+                hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link)
                         tun_flow_delete(tun, e);
         }
         spin_unlock_bh(&tun->lock);
@@ -256,9 +255,9 @@ static void tun_flow_delete_by_queue(struct tun_struct *tun, u16 queue_index)
         spin_lock_bh(&tun->lock);
         for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
                 struct tun_flow_entry *e;
-                struct hlist_node *h, *n;
+                struct hlist_node *n;
 
-                hlist_for_each_entry_safe(e, h, n, &tun->flows[i], hash_link) {
+                hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link) {
                         if (e->queue_index == queue_index)
                                 tun_flow_delete(tun, e);
                 }
@@ -279,9 +278,9 @@ static void tun_flow_cleanup(unsigned long data)
         spin_lock_bh(&tun->lock);
         for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {
                 struct tun_flow_entry *e;
-                struct hlist_node *h, *n;
+                struct hlist_node *n;
 
-                hlist_for_each_entry_safe(e, h, n, &tun->flows[i], hash_link) {
+                hlist_for_each_entry_safe(e, n, &tun->flows[i], hash_link) {
                         unsigned long this_timer;
                         count++;
                         this_timer = e->updated + delay;
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index f736823f8437..f10e58ac9c1b 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -145,9 +145,8 @@ static inline struct hlist_head *vni_head(struct net *net, u32 id)
 static struct vxlan_dev *vxlan_find_vni(struct net *net, u32 id)
 {
         struct vxlan_dev *vxlan;
-        struct hlist_node *node;
 
-        hlist_for_each_entry_rcu(vxlan, node, vni_head(net, id), hlist) {
+        hlist_for_each_entry_rcu(vxlan, vni_head(net, id), hlist) {
                 if (vxlan->vni == id)
                         return vxlan;
         }
@@ -292,9 +291,8 @@ static struct vxlan_fdb *vxlan_find_mac(struct vxlan_dev *vxlan,
 {
         struct hlist_head *head = vxlan_fdb_head(vxlan, mac);
         struct vxlan_fdb *f;
-        struct hlist_node *node;
 
-        hlist_for_each_entry_rcu(f, node, head, hlist) {
+        hlist_for_each_entry_rcu(f, head, hlist) {
                 if (compare_ether_addr(mac, f->eth_addr) == 0)
                         return f;
         }
@@ -422,10 +420,9 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
 
         for (h = 0; h < FDB_HASH_SIZE; ++h) {
                 struct vxlan_fdb *f;
-                struct hlist_node *n;
                 int err;
 
-                hlist_for_each_entry_rcu(f, n, &vxlan->fdb_head[h], hlist) {
+                hlist_for_each_entry_rcu(f, &vxlan->fdb_head[h], hlist) {
                         if (idx < cb->args[0])
                                 goto skip;
 
@@ -483,11 +480,10 @@ static bool vxlan_group_used(struct vxlan_net *vn,
                              const struct vxlan_dev *this)
 {
         const struct vxlan_dev *vxlan;
-        struct hlist_node *node;
         unsigned h;
 
         for (h = 0; h < VNI_HASH_SIZE; ++h)
-                hlist_for_each_entry(vxlan, node, &vn->vni_list[h], hlist) {
+                hlist_for_each_entry(vxlan, &vn->vni_list[h], hlist) {
                         if (vxlan == this)
                                 continue;
 
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 48273dd05b63..4941f201d6c8 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -309,7 +309,6 @@ static void zd1201_usbrx(struct urb *urb)
         if (data[urb->actual_length-1] == ZD1201_PACKET_RXDATA) {
                 int datalen = urb->actual_length-1;
                 unsigned short len, fc, seq;
-                struct hlist_node *node;
 
                 len = ntohs(*(__be16 *)&data[datalen-2]);
                 if (len>datalen)
@@ -362,7 +361,7 @@ static void zd1201_usbrx(struct urb *urb)
                                 hlist_add_head(&frag->fnode, &zd->fraglist);
                                 goto resubmit;
                         }
-                        hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
+                        hlist_for_each_entry(frag, &zd->fraglist, fnode)
                                 if (frag->seq == (seq&IEEE80211_SCTL_SEQ))
                                         break;
                         if (!frag)
@@ -1831,14 +1830,14 @@ err_zd:
 static void zd1201_disconnect(struct usb_interface *interface)
 {
         struct zd1201 *zd = usb_get_intfdata(interface);
-        struct hlist_node *node, *node2;
+        struct hlist_node *node2;
         struct zd1201_frag *frag;
 
         if (!zd)
                 return;
         usb_set_intfdata(interface, NULL);
 
-        hlist_for_each_entry_safe(frag, node, node2, &zd->fraglist, fnode) {
+        hlist_for_each_entry_safe(frag, node2, &zd->fraglist, fnode) {
                 hlist_del_init(&frag->fnode);
                 kfree_skb(frag->skb);
                 kfree(frag);