git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into irq/core, to fix conflict
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
hw
/
hfi1
/
driver.c
diff --git
a/drivers/infiniband/hw/hfi1/driver.c
b/drivers/infiniband/hw/hfi1/driver.c
index 61f341c3005cb972dc56a8c34e64fbbc7cd03131..e2c634af40e990103d9010c5e0eab5cd80faa663 100644
(file)
--- a/
drivers/infiniband/hw/hfi1/driver.c
+++ b/
drivers/infiniband/hw/hfi1/driver.c
@@
-1012,6
+1012,8
@@
int handle_receive_interrupt(struct hfi1_ctxtdata *rcd, int thread)
struct hfi1_packet packet;
int skip_pkt = 0;
+ if (!rcd->rcvhdrq)
+ return RCV_PKT_OK;
/* Control context will always use the slow path interrupt handler */
needset = (rcd->ctxt == HFI1_CTRL_CTXT) ? 0 : 1;