bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-f8c9ec6e' into 'stable-1.5' 

Merge branch 'v6.1-fixups' into 'master'

See merge request etherlab.org/ethercat!69
This commit is contained in:
Florian Pose 2023-05-25 14:31:14 +00:00
parent 8b20d480aa 9ac57fa55d
commit 858840d598
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tty/module.c
View File

@ -45,6 +45,10 @@
#include <linux/uaccess.h>
#include <linux/slab.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
#include <linux/termios_internal.h>
#endif
#include "../master/globals.h"
#include "../include/ectty.h"
@ -634,8 +638,13 @@ static int ec_tty_ioctl(struct tty_struct *tty,
/*****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
static void ec_tty_set_termios(struct tty_struct *tty,
const struct ktermios *old_termios)
#else
static void ec_tty_set_termios(struct tty_struct *tty,
struct ktermios *old_termios)
#endif
{
ec_tty_t *t = (ec_tty_t *) tty->driver_data;
int ret;