mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Bryan O'Sullivan" <bos@pathscale.com>
To: rdreier@cisco.com
Cc: openib-general@openib.org, linux-kernel@vger.kernel.org
Subject: [PATCH 21 of 23] IB/ipath - fix return value from ipath_poll
Date: Fri, 25 Aug 2006 11:24:46 -0700	[thread overview]
Message-ID: <1f9c75c844a96aa8f1e3.1156530286@eng-12.pathscale.com> (raw)
In-Reply-To: <patchbomb.1156530265@eng-12.pathscale.com>

This stops the generic poll code from waiting for a timeout.

Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>

diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c	Fri Aug 25 11:19:45 2006 -0700
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c	Fri Aug 25 11:19:45 2006 -0700
@@ -1150,6 +1150,7 @@ static unsigned int ipath_poll(struct fi
 	struct ipath_portdata *pd;
 	u32 head, tail;
 	int bit;
+	unsigned pollflag = 0;
 	struct ipath_devdata *dd;
 
 	pd = port_fp(fp);
@@ -1186,9 +1187,12 @@ static unsigned int ipath_poll(struct fi
 			clear_bit(IPATH_PORT_WAITING_RCV, &pd->port_flag);
 			pd->port_rcvwait_to++;
 		}
+		else
+			pollflag = POLLIN | POLLRDNORM;
 	}
 	else {
 		/* it's already happened; don't do wait_event overhead */
+		pollflag = POLLIN | POLLRDNORM;
 		pd->port_rcvnowait++;
 	}
 
@@ -1196,7 +1200,7 @@ static unsigned int ipath_poll(struct fi
 	ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
 			 dd->ipath_rcvctrl);
 
-	return 0;
+	return pollflag;
 }
 
 static int try_alloc_port(struct ipath_devdata *dd, int port,

  parent reply	other threads:[~2006-08-25 18:27 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-25 18:24 [PATCH 0 of 23] IB/ipath - updates for 2.6.19 Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 1 of 23] IB/ipath - More changes to support InfiniPath on PowerPC 970 systems Bryan O'Sullivan
2006-08-25 19:45   ` Roland Dreier
2006-08-25 20:19     ` Bryan O'Sullivan
2006-08-29 23:04       ` Brendan Cully
2006-08-25 20:01   ` Roland Dreier
2006-08-25 18:24 ` [PATCH 2 of 23] IB/ipath - lock resource limit counters correctly Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 3 of 23] IB/ipath - fix for crash on module unload, if cfgports < portcnt Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 4 of 23] IB/ipath - fix handling of kpiobufs Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 5 of 23] IB/ipath - drop requirement that PIO buffers be mmaped write-only Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 6 of 23] IB/ipath - merge ipath_core and ib_ipath drivers Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 7 of 23] IB/ipath - simplify layering code Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 8 of 23] IB/ipath - simplify debugging code after ipath_core and ib_ipath merger Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 9 of 23] IB/ipath - remove stale references to userspace SMA Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 10 of 23] IB/ipath - trivial cleanups Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 11 of 23] IB/ipath - add new minor device to allow sending of diag packets Bryan O'Sullivan
2006-08-25 19:50   ` Roland Dreier
2006-08-25 20:20     ` Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 12 of 23] IB/ipath - do not allow use of CQ entries with invalid counts Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 13 of 23] IB/ipath - account for attached QPs correctly Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 14 of 23] IB/ipath - support new QLogic product naming scheme Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 15 of 23] IB/ipath - add serial number to hardware freeze error message Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 16 of 23] IB/ipath - be more strict about testing the modify QP verb Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 17 of 23] IB/ipath - validate path_mig_state properly Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 18 of 23] IB/ipath - put a limit on the number of QPs that can be created Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 19 of 23] IB/ipath - handle sq_sig_all field correctly Bryan O'Sullivan
2006-08-25 18:24 ` [PATCH 20 of 23] IB/ipath - allow SMA to be disabled Bryan O'Sullivan
2006-08-25 18:24 ` Bryan O'Sullivan [this message]
2006-08-25 18:24 ` [PATCH 22 of 23] IB/ipath - print warning if LID not acquired within one minute Bryan O'Sullivan
2006-08-25 19:35   ` Roland Dreier
2006-08-25 20:40     ` [openib-general] " Robert Walsh
2006-08-26 19:31       ` Michael S. Tsirkin
2006-08-27 22:25         ` Roland Dreier
2006-08-28  1:41           ` Robert Walsh
2006-08-25 18:24 ` [PATCH 23 of 23] IB/ipath - control receive polarity inversion Bryan O'Sullivan
2006-08-25 20:01   ` Roland Dreier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1f9c75c844a96aa8f1e3.1156530286@eng-12.pathscale.com \
    --to=bos@pathscale.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=openib-general@openib.org \
    --cc=rdreier@cisco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®