| Message ID | 1308177505-1843-1-git-send-email-sjur.brandeland@stericsson.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Sjur Brændeland <sjur.brandeland@stericsson.com> Date: Thu, 16 Jun 2011 00:38:25 +0200 > XOFF was mixed up with DOWN indication, causing causing CAIF channel to be > removed from mux and all incoming traffic to be lost after receiving flow-off. > Fix this by replacing FLOW_OFF with DOWN notification. > > Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c index 3a66b8c..c23979e 100644 --- a/net/caif/cfmuxl.c +++ b/net/caif/cfmuxl.c @@ -255,7 +255,7 @@ static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, if (cfsrvl_phyid_match(layer, phyid) && layer->ctrlcmd) { - if ((ctrl == _CAIF_CTRLCMD_PHYIF_FLOW_OFF_IND || + if ((ctrl == _CAIF_CTRLCMD_PHYIF_DOWN_IND || ctrl == CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND) && layer->id != 0) {
XOFF was mixed up with DOWN indication, causing causing CAIF channel to be removed from mux and all incoming traffic to be lost after receiving flow-off. Fix this by replacing FLOW_OFF with DOWN notification. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> --- Hi Dave, Please consider this bugfix for Linux 3.0. It's a one-liner fixing a silly copy-paste mistake. Thanks, Sjur net/caif/cfmuxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)