Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-05 19:39:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
tty/module.c: fixups for linux >= v6.1

See merge request etherlab.org/ethercat!68

(cherry picked from commit f8c9ec6e48)

bbb16b87 tty/module.c: adapt signature of ->set_termios method to v6.1
d39b4a59 tty/module.c: include proper header for INIT_C_CC definition
This commit is contained in:
Florian Pose
2023-05-25 14:26:10 +00:00
parent 8b20d480aa
commit 9ac57fa55d
1 changed files with 9 additions and 0 deletions
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;