diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-10-14 11:07:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-14 11:07:23 -0400 |
| commit | fbbfa34c2c25f163515d5229a6cbdff243588f88 (patch) | |
| tree | 754d32cb0a61410920face01948a29a44b359fbe /include/linux | |
| parent | IPv6: fix DESYNC_FACTOR (diff) | |
| parent | qed: Additional work toward cleaning C=1 (diff) | |
Merge branch 'qed-fixes'
Yuval Mintz says:
====================
qed: Fix dependencies and warnings series
The first patch in this series follows Dan Carpenter's reports about
Smatch warnings for recent qed additions and fixes those.
The second patch is the most significant one [and the reason this is
ntended for 'net'] - it's based on Arnd Bermann's suggestion for fixing
compilation issues that were introduced with the roce addition as a result
of certain combinations of qed, qede and qedr Kconfig options.
The third follows the discussion with Arnd and clears a lot of the warnings
that arise when compiling the drivers with "C=1".
Please consider applying this series to 'net'.
====================
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qed/qede_roce.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/qed/qede_roce.h b/include/linux/qed/qede_roce.h index 99fbe6d55acb..f48d64b0e2fb 100644 --- a/include/linux/qed/qede_roce.h +++ b/include/linux/qed/qede_roce.h @@ -68,7 +68,7 @@ void qede_roce_unregister_driver(struct qedr_driver *drv); bool qede_roce_supported(struct qede_dev *dev); -#if IS_ENABLED(CONFIG_INFINIBAND_QEDR) +#if IS_ENABLED(CONFIG_QED_RDMA) int qede_roce_dev_add(struct qede_dev *dev); void qede_roce_dev_event_open(struct qede_dev *dev); void qede_roce_dev_event_close(struct qede_dev *dev); |