| .. | .. |
|---|
| 2237 | 2237 | if (mgslpc_paranoia_check(info, tty->name, "mgslpc_ioctl")) |
|---|
| 2238 | 2238 | return -ENODEV; |
|---|
| 2239 | 2239 | |
|---|
| 2240 | | - if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && |
|---|
| 2241 | | - (cmd != TIOCMIWAIT)) { |
|---|
| 2240 | + if (cmd != TIOCMIWAIT) { |
|---|
| 2242 | 2241 | if (tty_io_error(tty)) |
|---|
| 2243 | 2242 | return -EIO; |
|---|
| 2244 | 2243 | } |
|---|
| .. | .. |
|---|
| 4170 | 4169 | * |
|---|
| 4171 | 4170 | * dev pointer to network device structure |
|---|
| 4172 | 4171 | */ |
|---|
| 4173 | | -static void hdlcdev_tx_timeout(struct net_device *dev) |
|---|
| 4172 | +static void hdlcdev_tx_timeout(struct net_device *dev, unsigned int txqueue) |
|---|
| 4174 | 4173 | { |
|---|
| 4175 | 4174 | MGSLPC_INFO *info = dev_to_port(dev); |
|---|
| 4176 | 4175 | unsigned long flags; |
|---|