cxgb4: Don't return EAGAIN when TCAM is full.

During hash filter programming, driver needs to return ENOSPC error
intead of EAGAIN when TCAM is full.

Signed-off-by: Vishal Kulkarni <vishal@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
index 5afb430000499ba55cad2da1f7a5619ff823d9be..93ad4bee3401e9d58ff75add621ff4b1ccb72087 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
@@ -1722,12 +1722,13 @@ void hash_filter_rpl(struct adapter *adap, const struct cpl_act_open_rpl *rpl)
                break;
 
        default:
-               dev_err(adap->pdev_dev, "%s: filter creation PROBLEM; status = %u\n",
-                       __func__, status);
+               if (status != CPL_ERR_TCAM_FULL)
+                       dev_err(adap->pdev_dev, "%s: filter creation PROBLEM; status = %u\n",
+                               __func__, status);
 
                if (ctx) {
                        if (status == CPL_ERR_TCAM_FULL)
-                               ctx->result = -EAGAIN;
+                               ctx->result = -ENOSPC;
                        else
                                ctx->result = -EINVAL;
                }

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
index 82a8d19700602e6922765d647030a69d971de5ae..6e2d80008a79497bcc8b1bcb9206220d6308019c 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
@@ -687,11 +687,8 @@ int cxgb4_tc_flower_replace(struct net_device *dev,
 
        ret = ctx.result;
        /* Check if hw returned error for filter creation */
-       if (ret) {
-               netdev_err(dev, "%s: filter creation err %d\n",
-                          __func__, ret);
+       if (ret)
                goto free_entry;
-       }
 
        ch_flower->tc_flower_cookie = cls->cookie;
        ch_flower->filter_id = ctx.tid;