rtl8180: adapt for deprecated IEEE80211_CONF_SHORT_SLOT_TIME flag

[karo-tx-linux.git] / drivers / net / slip.c

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 84af68fdb6c2b08ca53bc2357a5db17959825cee..25cec06d6dcc661f0c6bcbb6f039555b529ea836 100644 (file)
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -365,7 +365,6 @@ static void sl_bump(struct slip *sl)
        skb_reset_mac_header(skb);
        skb->protocol = htons(ETH_P_IP);
        netif_rx(skb);
-       sl->dev->last_rx = jiffies;
        sl->rx_packets++;
 }
 
@@ -1301,7 +1300,7 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 #endif
 /* VSV changes end */
 
-static struct tty_ldisc        sl_ldisc = {
+static struct tty_ldisc_ops sl_ldisc = {
        .owner          = THIS_MODULE,
        .magic          = TTY_LDISC_MAGIC,
        .name           = "slip",