patch-2.3.14 linux/drivers/net/slip.c

• Lines: 99
• Date: Wed Aug 18 11:36:42 1999
• Orig file: v2.3.13/linux/drivers/net/slip.c
• Orig date: Mon Aug 9 14:59:22 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/slip.c linux/drivers/net/slip.c
@@ -91,7 +91,7 @@
 typedef struct slip_ctrl {
 	char		if_name[8];	/* "sl0\0" .. "sl99999\0"	*/
 	struct slip	ctrl;		/* SLIP things			*/
-	struct device	dev;		/* the device			*/
+	struct net_device	dev;		/* the device			*/
 } slip_ctrl_t;
 static slip_ctrl_t	**slip_ctrls = NULL;
 
@@ -109,7 +109,7 @@
 #ifdef CONFIG_SLIP_SMART
 static void sl_keepalive(unsigned long sls);
 static void sl_outfill(unsigned long sls);
-static int sl_ioctl(struct device *dev,struct ifreq *rq,int cmd);
+static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd);
 #endif
 
 /********************************
@@ -233,7 +233,7 @@
 static int sl_realloc_bufs(struct slip *sl, int mtu)
 {
 	int err = 0;
-	struct device *dev = sl->dev;
+	struct net_device *dev = sl->dev;
 	unsigned char *xbuff, *rbuff;
 #ifdef SL_INCLUDE_CSLIP
 	unsigned char *cbuff;
@@ -473,7 +473,7 @@
 
 /* Encapsulate an IP datagram and kick it into a TTY queue. */
 static int
-sl_xmit(struct sk_buff *skb, struct device *dev)
+sl_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct slip *sl = (struct slip*)(dev->priv);
 
@@ -536,7 +536,7 @@
 /* Netdevice UP -> DOWN routine */
 
 static int
-sl_close(struct device *dev)
+sl_close(struct net_device *dev)
 {
 	struct slip *sl = (struct slip*)(dev->priv);
 
@@ -557,7 +557,7 @@
 
 /* Netdevice DOWN -> UP routine */
 
-static int sl_open(struct device *dev)
+static int sl_open(struct net_device *dev)
 {
 	struct slip *sl = (struct slip*)(dev->priv);
 
@@ -573,7 +573,7 @@
 
 /* Netdevice change MTU request */
 
-static int sl_change_mtu(struct device *dev, int new_mtu)
+static int sl_change_mtu(struct net_device *dev, int new_mtu)
 {
 	struct slip *sl = (struct slip*)(dev->priv);
 
@@ -588,7 +588,7 @@
 /* Netdevice get statistics request */
 
 static struct net_device_stats *
-sl_get_stats(struct device *dev)
+sl_get_stats(struct net_device *dev)
 {
 	static struct net_device_stats stats;
 	struct slip *sl = (struct slip*)(dev->priv);
@@ -624,7 +624,7 @@
 
 /* Netdevice register callback */
 
-static int sl_init(struct device *dev)
+static int sl_init(struct net_device *dev)
 {
 	struct slip *sl = (struct slip*)(dev->priv);
 
@@ -1243,7 +1243,7 @@
    to allow get/set outfill/keepalive parameter
    by ifconfig                                 */
 
-static int sl_ioctl(struct device *dev,struct ifreq *rq,int cmd)
+static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd)
 {
 	struct slip *sl = (struct slip*)(dev->priv);
 
@@ -1318,7 +1318,7 @@
 #ifdef MODULE
 static int slip_init_ctrl_dev(void)
 #else	/* !MODULE */
-int __init slip_init_ctrl_dev(struct device *dummy)
+int __init slip_init_ctrl_dev(struct net_device *dummy)
 #endif	/* !MODULE */
 {
 	int status;