diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-07-21 20:24:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-21 20:24:32 -0700 |
| commit | 1bb4238b17b5de6cdc120970a9d00dd8a44f40df (patch) | |
| tree | 4079e5c0c2068538217d3af5840fa3422224a9db /drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |
| parent | Merge branch 'enic-next' (diff) | |
| parent | iw_cxgb4: Don't limit TPTE count to 32KB (diff) | |
| download | linux-dev-1bb4238b17b5de6cdc120970a9d00dd8a44f40df.tar.xz linux-dev-1bb4238b17b5de6cdc120970a9d00dd8a44f40df.zip | |
Merge branch 'cxgb4-next'
Hariprasad Shenai says:
====================
Misc. fix for cxgb4 and iw_cxgb4
This patch series adds support to enchance error reporting, log detailed
warning for negative advice, support query_qp verb and advertise correct
device max attributes for iwarp.
The patches series is created against 'net-next' tree.
And includes patches on cxgb4 and iw_cxgb4 driver.
Since this patch-series contains changes which are dependent on commit id
4c2c5763 ("cxgb4/iw_cxgb4: use firmware ord/ird resource limits") of net-next
tree we would like to request this patch series to get merged via David Miller's
'net-next' tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/iw_cxgb4.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index 69f047cdba6a..c378fd25ee0c 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -193,7 +193,7 @@ static inline int c4iw_fatal_error(struct c4iw_rdev *rdev) static inline int c4iw_num_stags(struct c4iw_rdev *rdev) { - return min((int)T4_MAX_NUM_STAG, (int)(rdev->lldi.vr->stag.size >> 5)); + return (int)(rdev->lldi.vr->stag.size >> 5); } #define C4IW_WR_TO (30*HZ) |