patch-2.3.14 linux/net/appletalk/ddp.c

• Lines: 153
• Date: Wed Aug 18 11:38:48 1999
• Orig file: v2.3.13/linux/net/appletalk/ddp.c
• Orig date: Thu Jul 8 15:42:21 1999

diff -u --recursive --new-file v2.3.13/linux/net/appletalk/ddp.c linux/net/appletalk/ddp.c
@@ -92,7 +92,7 @@
 
 extern void aarp_probe_network(struct atalk_iface *atif);
 extern int  aarp_proxy_probe_network(struct atalk_iface *atif, struct at_addr *sa);
-extern void aarp_proxy_remove(struct device *dev, struct at_addr *sa);
+extern void aarp_proxy_remove(struct net_device *dev, struct at_addr *sa);
 
 
 #undef APPLETALK_DEBUG
@@ -283,7 +283,7 @@
  * Drop a device. Doesn't drop any of its routes - that is the caller's
  * problem. Called when we down the interface or delete the address.
  */
-static void atif_drop_device(struct device *dev)
+static void atif_drop_device(struct net_device *dev)
 {
 	struct atalk_iface **iface = &atalk_iface_list;
 	struct atalk_iface *tmp;
@@ -303,7 +303,7 @@
 
 }
 
-static struct atalk_iface *atif_add_device(struct device *dev, struct at_addr *sa)
+static struct atalk_iface *atif_add_device(struct net_device *dev, struct at_addr *sa)
 {
 	struct atalk_iface *iface = (struct atalk_iface *)
 		kmalloc(sizeof(*iface), GFP_KERNEL);
@@ -452,7 +452,7 @@
 }
 
 
-struct at_addr *atalk_find_dev_addr(struct device *dev)
+struct at_addr *atalk_find_dev_addr(struct net_device *dev)
 {
 	struct atalk_iface *iface=dev->atalk_ptr;
 
@@ -491,7 +491,7 @@
  * Find a match for 'any network' - ie any of our interfaces with that
  * node number will do just nicely.
  */
-static struct atalk_iface *atalk_find_anynet(int node, struct device *dev)
+static struct atalk_iface *atalk_find_anynet(int node, struct net_device *dev)
 {
 	struct atalk_iface *iface=dev->atalk_ptr;
 
@@ -589,7 +589,7 @@
  * Given an AppleTalk network, find the device to use. This can be
  * a simple lookup.
  */
-struct device *atrtr_get_dev(struct at_addr *sa)
+struct net_device *atrtr_get_dev(struct at_addr *sa)
 {
 	struct atalk_route *atr=atrtr_find(sa);
 
@@ -602,7 +602,7 @@
 /*
  * Set up a default router.
  */
-static void atrtr_set_default(struct device *dev)
+static void atrtr_set_default(struct net_device *dev)
 {
 	atrtr_default.dev = dev;
 	atrtr_default.flags = RTF_UP;
@@ -615,7 +615,7 @@
  * entry in the list. While it uses netranges we always set them to one
  * entry to work like netatalk.
  */
-static int atrtr_create(struct rtentry *r, struct device *devhint)
+static int atrtr_create(struct rtentry *r, struct net_device *devhint)
 {
 	struct sockaddr_at *ta=(struct sockaddr_at *)&r->rt_dst;
 	struct sockaddr_at *ga=(struct sockaddr_at *)&r->rt_gateway;
@@ -725,7 +725,7 @@
  * Called when a device is downed. Just throw away any routes
  * via it.
  */
-void atrtr_device_down(struct device *dev)
+void atrtr_device_down(struct net_device *dev)
 {
 	struct atalk_route **r = &atalk_router_list;
 	struct atalk_route *tmp;
@@ -748,7 +748,7 @@
 /*
  * Actually down the interface.
  */
-static inline void atalk_dev_down(struct device *dev)
+static inline void atalk_dev_down(struct net_device *dev)
 {
 	atrtr_device_down(dev);	/* Remove all routes for the device */
 	aarp_device_down(dev);	/* Remove AARP entries for the device */
@@ -764,7 +764,7 @@
 	if(event == NETDEV_DOWN)
 	{
 		/* Discard any use of this */
-	        atalk_dev_down((struct device *) ptr);
+	        atalk_dev_down((struct net_device *) ptr);
 	}
 
 	return (NOTIFY_DONE);
@@ -783,7 +783,7 @@
 	static char aarp_mcast[6] = {0x09, 0x00, 0x00, 0xFF, 0xFF, 0xFF};
 	struct netrange *nr;
 	struct sockaddr_at *sa;
-	struct device *dev;
+	struct net_device *dev;
 	struct atalk_iface *atif;
 	int ct;
 	int limit;
@@ -1012,7 +1012,7 @@
 static int atrtr_ioctl(unsigned int cmd, void *arg)
 {
 	struct rtentry rt;
-	struct device *dev = NULL;
+	struct net_device *dev = NULL;
 
 	if(copy_from_user(&rt, arg, sizeof(rt)))
 		return (-EFAULT);
@@ -1422,7 +1422,7 @@
  * extracted. PPP should probably pass frames marked as for this layer.
  * [ie ARPHRD_ETHERTALK]
  */
-static int atalk_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *pt)
+static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
 {
 	struct sock *sock;
 	struct ddpehdr *ddp=(void *)skb->h.raw;
@@ -1593,7 +1593,7 @@
          */
         if(skb->data[12] == 22)
         {
-                struct device *dev;
+                struct net_device *dev;
 
 		/* This needs to be able to handle ipddp"N" devices */
                 if((dev = dev_get("ipddp0")) == NULL)
@@ -1645,7 +1645,7 @@
  * Caller must provide enough headroom on the packet to pull the short
  * header and append a long one.
  */
-static int ltalk_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *pt)
+static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
 {
 	struct ddpehdr *ddp;
 	struct at_addr *ap;
@@ -1712,7 +1712,7 @@
 	struct sockaddr_at *usat=(struct sockaddr_at *)msg->msg_name;
 	struct sockaddr_at local_satalk, gsat;
 	struct sk_buff *skb;
-	struct device *dev;
+	struct net_device *dev;
 	struct ddpehdr *ddp;
 	int size;
 	struct atalk_route *rt;