summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorsjur.brandeland@stericsson.com <sjur.brandeland@stericsson.com>2011-06-15 14:38:25 +0200
committerDavid S. Miller <davem@conan.davemloft.net>2011-06-17 05:59:09 +0200
commita1b7f85e4f632f9cc342d8a34a3903feaf47a261 (patch)
treea2bbeee334068e6da60d71d908524d9fa75274a7 /net
parenttun: teach the tun/tap driver to support netpoll (diff)
downloadlinux-a1b7f85e4f632f9cc342d8a34a3903feaf47a261.tar.xz
linux-a1b7f85e4f632f9cc342d8a34a3903feaf47a261.zip
caif: Bugfix - XOFF removed channel from caif-mux
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> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/caif/cfmuxl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c
index 3a66b8c10e09..c23979e79dfa 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) {