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

• Lines: 74
• Date: Wed Aug 18 11:36:41 1999
• Orig file: v2.3.13/linux/drivers/net/cosa.c
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/cosa.c linux/drivers/net/cosa.c
@@ -274,14 +274,14 @@
 /* SPPP/HDLC stuff */
 static void sppp_channel_init(struct channel_data *chan);
 static void sppp_channel_delete(struct channel_data *chan);
-static int cosa_sppp_open(struct device *d);
-static int cosa_sppp_close(struct device *d);
-static int cosa_sppp_tx(struct sk_buff *skb, struct device *d);
+static int cosa_sppp_open(struct net_device *d);
+static int cosa_sppp_close(struct net_device *d);
+static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *d);
 static char *sppp_setup_rx(struct channel_data *channel, int size);
 static int sppp_rx_done(struct channel_data *channel);
 static int sppp_tx_done(struct channel_data *channel, int size);
-static int cosa_sppp_ioctl(struct device *dev, struct ifreq *ifr, int cmd);
-static struct net_device_stats *cosa_net_stats(struct device *dev);
+static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
+static struct net_device_stats *cosa_net_stats(struct net_device *dev);
 
 /* Character device */
 static void chardev_channel_init(struct channel_data *chan);
@@ -568,7 +568,7 @@
 
 static void sppp_channel_init(struct channel_data *chan)
 {
-	struct device *d;
+	struct net_device *d;
 	sppp_attach(&chan->pppdev);
 	d=&chan->pppdev.dev;
 	d->name = chan->name;
@@ -597,7 +597,7 @@
 }
 
 
-static int cosa_sppp_open(struct device *d)
+static int cosa_sppp_open(struct net_device *d)
 {
 	struct channel_data *chan = d->priv;
 	int err, flags;
@@ -633,7 +633,7 @@
 	return 0;
 }
 
-static int cosa_sppp_tx(struct sk_buff *skb, struct device *dev)
+static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *dev)
 {
 	struct channel_data *chan = dev->priv;
 
@@ -665,7 +665,7 @@
 	return 0;
 }
 
-static int cosa_sppp_close(struct device *d)
+static int cosa_sppp_close(struct net_device *d)
 {
 	struct channel_data *chan = d->priv;
 	int flags;
@@ -747,7 +747,7 @@
 	return 1;
 }
 
-static struct net_device_stats *cosa_net_stats(struct device *dev)
+static struct net_device_stats *cosa_net_stats(struct net_device *dev)
 {
 	struct channel_data *chan = dev->priv;
 	return &chan->stats;
@@ -1166,7 +1166,7 @@
 	return -ENOIOCTLCMD;
 }
 
-static int cosa_sppp_ioctl(struct device *dev, struct ifreq *ifr,
+static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr,
 	int cmd)
 {
 	int rv;