aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-08-20 15:32:41 +0000
committerDavid S. Miller <davem@davemloft.net>2016-08-21 15:23:27 -0700
commit8c14846df3998cfc2ffe3e7e5624da2e76b1eccb (patch)
treeef3c6b719ed613421f59185ba1057353ac186000
parentl2tp: Refactor the codes with existing macros instead of literal number (diff)
downloadlinux-dev-8c14846df3998cfc2ffe3e7e5624da2e76b1eccb.tar.xz
linux-dev-8c14846df3998cfc2ffe3e7e5624da2e76b1eccb.zip
cxgb4: Simplify the return expression
Simplify the return expression. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 85e30f19e97a..0099a0cd53ea 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2932,7 +2932,6 @@ EXPORT_SYMBOL(cxgb4_create_server_filter);
int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid,
unsigned int queue, bool ipv6)
{
- int ret;
struct filter_entry *f;
struct adapter *adap;
@@ -2946,11 +2945,7 @@ int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid,
/* Unlock the filter */
f->locked = 0;
- ret = delete_filter(adap, stid);
- if (ret)
- return ret;
-
- return 0;
+ return delete_filter(adap, stid);
}
EXPORT_SYMBOL(cxgb4_remove_server_filter);