Merge branch 'cxgb4-next'

Anish Bhatt says:

====================
cxgb4/cxgb4i : Update & use ipv6 handling api

This patch series consolidates and updates the ipv6 api, as well as exports
it for use by upper level drivers dependent on cxgb4

v2: Fix formatting issues in clip_tbl.c
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 469 insertions, 164 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile
index b85280775997..ae50cd72358c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/Makefile
+++ b/drivers/net/ethernet/chelsio/cxgb4/Makefile
@@ -4,6 +4,6 @@
 
 obj-$(CONFIG_CHELSIO_T4) += cxgb4.o
 
-cxgb4-objs := cxgb4_main.o l2t.o t4_hw.o sge.o
+cxgb4-objs := cxgb4_main.o l2t.o t4_hw.o sge.o clip_tbl.o
 cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o
 cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o
diff --git a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
new file mode 100644
index 000000000000..2b407b6a35a8
--- /dev/null
+++ b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
@@ -0,0 +1,314 @@
+/*
+ *  This file is part of the Chelsio T4 Ethernet driver for Linux.
+ *  Copyright (C) 2003-2014 Chelsio Communications.  All rights reserved.
+ *
+ *  Written by Deepak (deepak.s@chelsio.com)
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the LICENSE file included in this
+ *  release for licensing terms and conditions.
+ */
+
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/jhash.h>
+#include <linux/if_vlan.h>
+#include <net/addrconf.h>
+#include "cxgb4.h"
+#include "clip_tbl.h"
+
+static inline unsigned int ipv4_clip_hash(struct clip_tbl *c, const u32 *key)
+{
+        unsigned int clipt_size_half = c->clipt_size / 2;
+
+        return jhash_1word(*key, 0) % clipt_size_half;
+}
+
+static inline unsigned int ipv6_clip_hash(struct clip_tbl *d, const u32 *key)
+{
+        unsigned int clipt_size_half = d->clipt_size / 2;
+        u32 xor = key[0] ^ key[1] ^ key[2] ^ key[3];
+
+        return clipt_size_half +
+                (jhash_1word(xor, 0) % clipt_size_half);
+}
+
+static unsigned int clip_addr_hash(struct clip_tbl *ctbl, const u32 *addr,
+                                   int addr_len)
+{
+        return addr_len == 4 ? ipv4_clip_hash(ctbl, addr) :
+                                ipv6_clip_hash(ctbl, addr);
+}
+
+static int clip6_get_mbox(const struct net_device *dev,
+                          const struct in6_addr *lip)
+{
+        struct adapter *adap = netdev2adap(dev);
+        struct fw_clip_cmd c;
+
+        memset(&c, 0, sizeof(c));
+        c.op_to_write = htonl(FW_CMD_OP_V(FW_CLIP_CMD) |
+                              FW_CMD_REQUEST_F | FW_CMD_WRITE_F);
+        c.alloc_to_len16 = htonl(FW_CLIP_CMD_ALLOC_F | FW_LEN16(c));
+        *(__be64 *)&c.ip_hi = *(__be64 *)(lip->s6_addr);
+        *(__be64 *)&c.ip_lo = *(__be64 *)(lip->s6_addr + 8);
+        return t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c, false);
+}
+
+static int clip6_release_mbox(const struct net_device *dev,
+                              const struct in6_addr *lip)
+{
+        struct adapter *adap = netdev2adap(dev);
+        struct fw_clip_cmd c;
+
+        memset(&c, 0, sizeof(c));
+        c.op_to_write = htonl(FW_CMD_OP_V(FW_CLIP_CMD) |
+                              FW_CMD_REQUEST_F | FW_CMD_READ_F);
+        c.alloc_to_len16 = htonl(FW_CLIP_CMD_FREE_F | FW_LEN16(c));
+        *(__be64 *)&c.ip_hi = *(__be64 *)(lip->s6_addr);
+        *(__be64 *)&c.ip_lo = *(__be64 *)(lip->s6_addr + 8);
+        return t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c, false);
+}
+
+int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6)
+{
+        struct adapter *adap = netdev2adap(dev);
+        struct clip_tbl *ctbl = adap->clipt;
+        struct clip_entry *ce, *cte;
+        u32 *addr = (u32 *)lip;
+        int hash;
+        int addr_len;
+        int ret = 0;
+
+        if (v6)
+                addr_len = 16;
+        else
+                addr_len = 4;
+
+        hash = clip_addr_hash(ctbl, addr, addr_len);
+
+        read_lock_bh(&ctbl->lock);
+        list_for_each_entry(cte, &ctbl->hash_list[hash], list) {
+                if (addr_len == cte->addr_len &&
+                    memcmp(lip, cte->addr, cte->addr_len) == 0) {
+                        ce = cte;
+                        read_unlock_bh(&ctbl->lock);
+                        goto found;
+                }
+        }
+        read_unlock_bh(&ctbl->lock);
+
+        write_lock_bh(&ctbl->lock);
+        if (!list_empty(&ctbl->ce_free_head)) {
+                ce = list_first_entry(&ctbl->ce_free_head,
+                                      struct clip_entry, list);
+                list_del(&ce->list);
+                INIT_LIST_HEAD(&ce->list);
+                spin_lock_init(&ce->lock);
+                atomic_set(&ce->refcnt, 0);
+                atomic_dec(&ctbl->nfree);
+                ce->addr_len = addr_len;
+                memcpy(ce->addr, lip, addr_len);
+                list_add_tail(&ce->list, &ctbl->hash_list[hash]);
+                if (v6) {
+                        ret = clip6_get_mbox(dev, (const struct in6_addr *)lip);
+                        if (ret) {
+                                write_unlock_bh(&ctbl->lock);
+                                return ret;
+                        }
+                }
+        } else {
+                write_unlock_bh(&ctbl->lock);
+                return -ENOMEM;
+        }
+        write_unlock_bh(&ctbl->lock);
+found:
+        atomic_inc(&ce->refcnt);
+
+        return 0;
+}
+EXPORT_SYMBOL(cxgb4_clip_get);
+
+void cxgb4_clip_release(const struct net_device *dev, const u32 *lip, u8 v6)
+{
+        struct adapter *adap = netdev2adap(dev);
+        struct clip_tbl *ctbl = adap->clipt;
+        struct clip_entry *ce, *cte;
+        u32 *addr = (u32 *)lip;
+        int hash;
+        int addr_len;
+
+        if (v6)
+                addr_len = 16;
+        else
+                addr_len = 4;
+
+        hash = clip_addr_hash(ctbl, addr, addr_len);
+
+        read_lock_bh(&ctbl->lock);
+        list_for_each_entry(cte, &ctbl->hash_list[hash], list) {
+                if (addr_len == cte->addr_len &&
+                    memcmp(lip, cte->addr, cte->addr_len) == 0) {
+                        ce = cte;
+                        read_unlock_bh(&ctbl->lock);
+                        goto found;
+                }
+        }
+        read_unlock_bh(&ctbl->lock);
+