mirror of
https://gitlab.com/etherlab.org/ethercat.git
synced 2026-08-18 00:57:23 +08:00
Merge branch 'v6.1-fixups' into 'master'
tty/module.c: fixups for linux >= v6.1 See merge request etherlab.org/ethercat!68
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -657,8 +661,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;
|
||||
|
||||
Reference in New Issue
Block a user