patch-2.3.14 linux/net/rose/rose_dev.c

• Lines: 78
• Date: Wed Aug 18 11:38:49 1999
• Orig file: v2.3.13/linux/net/rose/rose_dev.c
• Orig date: Thu Dec 17 09:07:45 1998

diff -u --recursive --new-file v2.3.13/linux/net/rose/rose_dev.c linux/net/rose/rose_dev.c
@@ -52,7 +52,7 @@
  *	Only allow IP over ROSE frames through if the netrom device is up.
  */
 
-int rose_rx_ip(struct sk_buff *skb, struct device *dev)
+int rose_rx_ip(struct sk_buff *skb, struct net_device *dev)
 {
 	struct net_device_stats *stats = (struct net_device_stats *)dev->priv;
 
@@ -80,7 +80,7 @@
 	return 1;
 }
 
-static int rose_header(struct sk_buff *skb, struct device *dev, unsigned short type,
+static int rose_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
 	void *daddr, void *saddr, unsigned len)
 {
 	unsigned char *buff = skb_push(skb, ROSE_MIN_LEN + 2);
@@ -99,7 +99,7 @@
 
 static int rose_rebuild_header(struct sk_buff *skb)
 {
-	struct device *dev = skb->dev;
+	struct net_device *dev = skb->dev;
 	struct net_device_stats *stats = (struct net_device_stats *)dev->priv;
 	unsigned char *bp = (unsigned char *)skb->data;
 	struct sk_buff *skbn;
@@ -130,7 +130,7 @@
 	return 1;
 }
 
-static int rose_set_mac_address(struct device *dev, void *addr)
+static int rose_set_mac_address(struct net_device *dev, void *addr)
 {
 	struct sockaddr *sa = addr;
 
@@ -143,7 +143,7 @@
 	return 0;
 }
 
-static int rose_open(struct device *dev)
+static int rose_open(struct net_device *dev)
 {
 	dev->tbusy = 0;
 	dev->start = 1;
@@ -155,7 +155,7 @@
 	return 0;
 }
 
-static int rose_close(struct device *dev)
+static int rose_close(struct net_device *dev)
 {
 	dev->tbusy = 1;
 	dev->start = 0;
@@ -167,7 +167,7 @@
 	return 0;
 }
 
-static int rose_xmit(struct sk_buff *skb, struct device *dev)
+static int rose_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct net_device_stats *stats = (struct net_device_stats *)dev->priv;
 
@@ -202,12 +202,12 @@
 	return 0;
 }
 
-static struct net_device_stats *rose_get_stats(struct device *dev)
+static struct net_device_stats *rose_get_stats(struct net_device *dev)
 {
 	return (struct net_device_stats *)dev->priv;
 }
 
-int rose_init(struct device *dev)
+int rose_init(struct net_device *dev)
 {
 	dev->mtu		= ROSE_MAX_PACKET_SIZE - 2;
 	dev->tbusy		= 0;