net: resolve symbol conflicts with generic hashtable.h

This is a preparatory patch for converting qdisc linked list into a
hashtable. As we'll need to include hashtable.h in netdevice.h, we first
have to make sure that this will not introduce symbol conflicts for any of
the netdevice.h users.

Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 727a79f3c7dd..2d6fc9a0fb21 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -597,14 +597,14 @@ static u32 hash_get(u8 *addr)
 }
 
 /**
- * hash_add - Hash function to add mac addr from hash table
+ * emac_hash_add - Hash function to add mac addr from hash table
  * @priv: The DaVinci EMAC private adapter structure
  * @mac_addr: mac address to delete from hash table
  *
  * Adds mac address to the internal hash table
  *
  */
-static int hash_add(struct emac_priv *priv, u8 *mac_addr)
+static int emac_hash_add(struct emac_priv *priv, u8 *mac_addr)
 {
         struct device *emac_dev = &priv->ndev->dev;
         u32 rc = 0;
@@ -613,7 +613,7 @@ static int hash_add(struct emac_priv *priv, u8 *mac_addr)
 
         if (hash_value >= EMAC_NUM_MULTICAST_BITS) {
                 if (netif_msg_drv(priv)) {
-                        dev_err(emac_dev, "DaVinci EMAC: hash_add(): Invalid "\
+                        dev_err(emac_dev, "DaVinci EMAC: emac_hash_add(): Invalid "\
                                 "Hash %08x, should not be greater than %08x",
                                 hash_value, (EMAC_NUM_MULTICAST_BITS - 1));
                 }
@@ -639,14 +639,14 @@ static int hash_add(struct emac_priv *priv, u8 *mac_addr)
 }
 
 /**
- * hash_del - Hash function to delete mac addr from hash table
+ * emac_hash_del - Hash function to delete mac addr from hash table
  * @priv: The DaVinci EMAC private adapter structure
  * @mac_addr: mac address to delete from hash table
  *
  * Removes mac address from the internal hash table
  *
  */
-static int hash_del(struct emac_priv *priv, u8 *mac_addr)
+static int emac_hash_del(struct emac_priv *priv, u8 *mac_addr)
 {
         u32 hash_value;
         u32 hash_bit;
@@ -696,10 +696,10 @@ static void emac_add_mcast(struct emac_priv *priv, u32 action, u8 *mac_addr)
 
         switch (action) {
         case EMAC_MULTICAST_ADD:
-                update = hash_add(priv, mac_addr);
+                update = emac_hash_add(priv, mac_addr);
                 break;
         case EMAC_MULTICAST_DEL:
-                update = hash_del(priv, mac_addr);
+                update = emac_hash_del(priv, mac_addr);
                 break;
         case EMAC_ALL_MULTI_SET:
                 update = 1;