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

• Lines: 78
• Date: Wed Aug 18 11:38:49 1999
• Orig file: v2.3.13/linux/net/rose/af_rose.c
• Orig date: Thu Jul 8 15:42:21 1999

diff -u --recursive --new-file v2.3.13/linux/net/rose/af_rose.c linux/net/rose/af_rose.c
@@ -215,7 +215,7 @@
 /*
  *	Kill all bound sockets on a dropped device.
  */
-static void rose_kill_by_device(struct device *dev)
+static void rose_kill_by_device(struct net_device *dev)
 {
 	struct sock *s;
 	
@@ -233,7 +233,7 @@
  */
 static int rose_device_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
-	struct device *dev = (struct device *)ptr;
+	struct net_device *dev = (struct net_device *)ptr;
 
 	if (event != NETDEV_DOWN)
 		return NOTIFY_DONE;
@@ -667,7 +667,7 @@
 {
 	struct sock *sk = sock->sk;
 	struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr;
-	struct device *dev;
+	struct net_device *dev;
 	ax25_address *user, *source;
 	int n;
 
@@ -727,7 +727,7 @@
 	struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr;
 	unsigned char cause, diagnostic;
 	ax25_address *user;
-	struct device *dev;
+	struct net_device *dev;
 	int n;
 
 	if (sk->state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) {
@@ -945,7 +945,7 @@
 	return 0;
 }
 
-int rose_rx_call_request(struct sk_buff *skb, struct device *dev, struct rose_neigh *neigh, unsigned int lci)
+int rose_rx_call_request(struct sk_buff *skb, struct net_device *dev, struct rose_neigh *neigh, unsigned int lci)
 {
 	struct sock *sk;
 	struct sock *make;
@@ -1366,7 +1366,7 @@
 static int rose_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
 {
 	struct sock *s;
-	struct device *dev;
+	struct net_device *dev;
 	const char *devname, *callsign;
 	int len = 0;
 	off_t pos = 0;
@@ -1491,7 +1491,7 @@
 };
 #endif	
 
-static struct device *dev_rose;
+static struct net_device *dev_rose;
 
 __initfunc(void rose_proto_init(struct net_proto *pro))
 {
@@ -1499,12 +1499,12 @@
 
 	rose_callsign = null_ax25_address;
 
-	if ((dev_rose = kmalloc(rose_ndevs * sizeof(struct device), GFP_KERNEL)) == NULL) {
+	if ((dev_rose = kmalloc(rose_ndevs * sizeof(struct net_device), GFP_KERNEL)) == NULL) {
 		printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n");
 		return;
 	}
 
-	memset(dev_rose, 0x00, rose_ndevs * sizeof(struct device));
+	memset(dev_rose, 0x00, rose_ndevs * sizeof(struct net_device));
 
 	for (i = 0; i < rose_ndevs; i++) {
 		dev_rose[i].name = kmalloc(20, GFP_KERNEL);