diff options
| author | Ralph Campbell <ralph.campbell@qlogic.com> | 2010-06-03 02:21:07 +0200 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-07-19 22:21:24 +0200 |
| commit | cc323b2aaa3921c4eeec309ff64256b0c43ca752 (patch) | |
| tree | 9f07d591a8baf9a267897a3c2a87859f54c27ce2 /drivers/infiniband | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-cc323b2aaa3921c4eeec309ff64256b0c43ca752.tar.xz linux-cc323b2aaa3921c4eeec309ff64256b0c43ca752.zip | |
IB/qib: Avoid variable-length array
Rather than use a variable size array allocation on the stack,
define a constant for the maximum array size possible.
Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib.h | 3 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_tx.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h index 3593983df7ba..e67dba40d52e 100644 --- a/drivers/infiniband/hw/qib/qib.h +++ b/drivers/infiniband/hw/qib/qib.h @@ -326,6 +326,9 @@ struct qib_verbs_txreq { #define QIB_DEFAULT_MTU 4096 +/* max number of IB ports supported per HCA */ +#define QIB_MAX_IB_PORTS 2 + /* * Possible IB config parameters for f_get/set_ib_table() */ diff --git a/drivers/infiniband/hw/qib/qib_tx.c b/drivers/infiniband/hw/qib/qib_tx.c index af30232b6831..7f36454c225e 100644 --- a/drivers/infiniband/hw/qib/qib_tx.c +++ b/drivers/infiniband/hw/qib/qib_tx.c @@ -170,7 +170,7 @@ static int find_ctxt(struct qib_devdata *dd, unsigned bufn) void qib_disarm_piobufs_set(struct qib_devdata *dd, unsigned long *mask, unsigned cnt) { - struct qib_pportdata *ppd, *pppd[dd->num_pports]; + struct qib_pportdata *ppd, *pppd[QIB_MAX_IB_PORTS]; unsigned i; unsigned long flags; |