diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /hdlcutil/usersmdiag.h | |
parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'hdlcutil/usersmdiag.h')
-rw-r--r-- | hdlcutil/usersmdiag.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hdlcutil/usersmdiag.h b/hdlcutil/usersmdiag.h index 0fe829d..e40f889 100644 --- a/hdlcutil/usersmdiag.h +++ b/hdlcutil/usersmdiag.h @@ -25,7 +25,7 @@ */ /*****************************************************************************/ - + #ifndef _USERSMDIAG_H #define _USERSMDIAG_H @@ -85,7 +85,7 @@ struct usersmmsg { int fulldup; /* some driver do not support full duplex, setting */ /* this just makes them send even if DCD is on */ } cp; - + int calib; struct usersm_channel_state { @@ -97,7 +97,7 @@ struct usersmmsg { unsigned long rx_packets; unsigned long rx_errors; } cs; - + struct usersm_diag { unsigned int mode; unsigned int flags; |