summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDu, Alek <alek.du@intel.com>2011-07-07 15:16:48 +0100
committerJonas ABERG <jonas.aberg@stericsson.com>2011-10-28 11:14:45 +0200
commit189c16b06621168c1fe37723462fc7b56943ded6 (patch)
treedb15688c1f4ff3d42d9eb24581212b9fadf1e3eb
parentbe64c77d0411e103158bc798f8f1683e6f279619 (diff)
n_gsm: fix the wrong FCS handling
commit f086ced17191fa0c5712539d2b680eae3dc972a1 upstream. FCS could be GSM0_SOF, so will break state machine... [This byte isn't quoted in any way so a SOF here doesn't imply an error occurred.] Signed-off-by: Alek Du <alek.du@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> [Trivial but best backported once its in 3.1rc I think] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Id1ae181f64525d175ab2da4b5293ee374af75cb1 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35660 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/tty/n_gsm.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 19b4ae052af..c0d34addc2d 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -1823,10 +1823,6 @@ static void gsm0_receive(struct gsm_mux *gsm, unsigned char c)
break;
case GSM_FCS: /* FCS follows the packet */
gsm->received_fcs = c;
- if (c == GSM0_SOF) {
- gsm->state = GSM_SEARCH;
- break;
- }
gsm_queue(gsm);
gsm->state = GSM_SSOF;
break;