summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rdma
diff options
context:
space:
mode:
authorJubin John <jubin.john@intel.com>2015-11-20 18:13:08 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-21 13:48:27 -0800
commit9d2f53ef42c15f6e47b48246beb0a32c4ff3b3ed (patch)
tree667131964611769ece0215cca9181a4234204ca6 /drivers/staging/rdma
parentcd371e0959a3f2d5df69d50000750f7eefc94659 (diff)
downloadtalos-obmc-linux-9d2f53ef42c15f6e47b48246beb0a32c4ff3b3ed.tar.gz
talos-obmc-linux-9d2f53ef42c15f6e47b48246beb0a32c4ff3b3ed.zip
staging/rdma/hfi1: Fix error in hfi1 driver build
hfi1 driver build fails with the following error: In function ‘handle_receive_interrupt’: error: implicit declaration of function ‘skip_rcv_packet’ [-Werror=implicit-function-declaration] last = skip_rcv_packet(&packet, thread); ^ This is due to the inclusion of the skip_rcv_packet() in the CONFIG_PRESCAN_RXQ ifdef block. This function is independent of CONFIG_PRESCAN_RXQ and should be outside this block. Fixes: 82c2611daaf0 ("staging/rdma/hfi1: Handle packets with invalid RHF on context 0") Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Jubin John <jubin.john@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rdma')
-rw-r--r--drivers/staging/rdma/hfi1/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rdma/hfi1/driver.c b/drivers/staging/rdma/hfi1/driver.c
index 745817ea42e2..8485de1fce08 100644
--- a/drivers/staging/rdma/hfi1/driver.c
+++ b/drivers/staging/rdma/hfi1/driver.c
@@ -633,6 +633,7 @@ next:
update_ps_mdata(&mdata, rcd);
}
}
+#endif /* CONFIG_PRESCAN_RXQ */
static inline int skip_rcv_packet(struct hfi1_packet *packet, int thread)
{
@@ -659,7 +660,6 @@ static inline int skip_rcv_packet(struct hfi1_packet *packet, int thread)
return ret;
}
-#endif /* CONFIG_PRESCAN_RXQ */
static inline int process_rcv_packet(struct hfi1_packet *packet, int thread)
{
OpenPOWER on IntegriCloud