summaryrefslogtreecommitdiffstats
path: root/sys-utils/ldattach.c
diff options
context:
space:
mode:
authorTilman Schmidt2015-07-09 15:22:32 +0200
committerKarel Zak2015-07-15 15:46:18 +0200
commit58c174609450af544f3db0d9c14a95883d053edf (patch)
treeac5e9b7ab7d739e3a827059064be483d43ea93c2 /sys-utils/ldattach.c
parentldattach: always set line speed and format for N_GIGASET_M101 (diff)
downloadkernel-qcow2-util-linux-58c174609450af544f3db0d9c14a95883d053edf.tar.gz
kernel-qcow2-util-linux-58c174609450af544f3db0d9c14a95883d053edf.tar.xz
kernel-qcow2-util-linux-58c174609450af544f3db0d9c14a95883d053edf.zip
ldattach: order line disciplines canonically
List line disciplines in numerical order and put official names before convenience aliases. Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Diffstat (limited to 'sys-utils/ldattach.c')
-rw-r--r--sys-utils/ldattach.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 9c1235d67..99db32e86 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -62,14 +62,15 @@ struct gsm_config
#ifndef N_GIGASET_M101
# define N_GIGASET_M101 16
#endif
-#ifndef N_GSM0710
-# define N_GSM0710 21
-#endif
#ifndef N_PPS
# define N_PPS 18
#endif
+#ifndef N_GSM0710
+# define N_GSM0710 21
+#endif
+
#define MAXINTROPARMLEN 32
/* attach a line discipline ioctl */
@@ -86,7 +87,6 @@ struct ld_table {
/* currently supported line disciplines, plus some aliases */
static const struct ld_table ld_discs[] = {
- { "GSM0710", N_GSM0710},
{ "TTY", N_TTY },
{ "SLIP", N_SLIP },
{ "MOUSE", N_MOUSE },
@@ -101,10 +101,11 @@ static const struct ld_table ld_discs[] = {
{ "SYNC_PPP", N_SYNC_PPP },
{ "SYNCPPP", N_SYNC_PPP },
{ "HCI", N_HCI },
- { "PPS", N_PPS },
+ { "GIGASET_M101", N_GIGASET_M101 },
{ "M101", N_GIGASET_M101 },
{ "GIGASET", N_GIGASET_M101 },
- { "GIGASET_M101", N_GIGASET_M101 },
+ { "PPS", N_PPS },
+ { "GSM0710", N_GSM0710},
{ NULL, 0 }
};