patch-2.3.14 linux/include/net/dn_dev.h

Next file: linux/include/net/dn_neigh.h
Previous file: linux/include/net/datalink.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/include/net/dn_dev.h linux/include/net/dn_dev.h
@@ -79,10 +79,10 @@
 	int priority;             /* Priority to be a router        */
 	char *name;               /* Name for sysctl                */
 	int ctl_name;             /* Index for sysctl               */
-	int  (*up)(struct device *);
-	void (*down)(struct device *);
-	void (*timer1)(struct device *);
-	void (*timer3)(struct device *);
+	int  (*up)(struct net_device *);
+	void (*down)(struct net_device *);
+	void (*timer1)(struct net_device *);
+	void (*timer3)(struct net_device *);
 	int (*setsrc)(struct sk_buff *skb);
 	int (*neigh_setup)(struct neighbour *);
 	void *sysctl;
@@ -91,7 +91,7 @@
 
 struct dn_dev {
 	struct dn_ifaddr *ifa_list;
-	struct device *dev;
+	struct net_device *dev;
 	struct dn_dev_parms parms;
 	char use_long;
         struct timer_list timer;
@@ -169,12 +169,12 @@
 extern void dn_dev_veri_pkt(struct sk_buff *skb);
 extern void dn_dev_hello(struct sk_buff *skb);
 
-extern void dn_dev_up(struct device *);
-extern void dn_dev_down(struct device *);
+extern void dn_dev_up(struct net_device *);
+extern void dn_dev_down(struct net_device *);
 
-extern struct device *decnet_default_device;
+extern struct net_device *decnet_default_device;
 
-static __inline__ int dn_dev_islocal(struct device *dev, dn_address addr)
+static __inline__ int dn_dev_islocal(struct net_device *dev, dn_address addr)
 {
 	struct dn_dev *dn_db = dev->dn_ptr;
 	struct dn_ifaddr *ifa;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)