diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-06 21:49:41 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-06 21:51:26 +0200 |
| commit | 9960d59fffa176ab022c9641c7358030d7f8065c (patch) | |
| tree | 18573b4edf3eb496307d4b33d99ca031c98c3981 /openbsc/src/vty/vty.c | |
| parent | 161bd6d253abeef6b181dbe9fdd245bd7c9884af (diff) | |
| parent | 3c71232b112a40bf09bd9687f1bc6aed12e863a3 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to the new log code and update binaries
* Catch up with lchan changes from master
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/src/Makefile.am
openbsc/src/bsc_rll.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_04_08.c
openbsc/src/gsm_04_11.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/handover_logic.c
openbsc/src/silent_call.c
openbsc/src/transaction.c
openbsc/src/vty_interface.c
openbsc/src/vty_interface_cmds.c
Diffstat (limited to 'openbsc/src/vty/vty.c')
| -rw-r--r-- | openbsc/src/vty/vty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsc/src/vty/vty.c b/openbsc/src/vty/vty.c index 1260f38c5..0ac9530f5 100644 --- a/openbsc/src/vty/vty.c +++ b/openbsc/src/vty/vty.c @@ -526,7 +526,7 @@ vty_telnet_option (struct vty *vty, unsigned char *buf, int nbytes) vty->iac_sb_in_progress = 1; return 0; break; - case SE: + case SE: { if (!vty->iac_sb_in_progress) return 0; |