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

• Lines: 47
• Date: Wed Aug 18 11:38:47 1999
• Orig file: v2.3.13/linux/include/net/netrom.h
• Orig date: Sat Apr 11 17:18:15 1998

diff -u --recursive --new-file v2.3.13/linux/include/net/netrom.h linux/include/net/netrom.h
@@ -56,7 +56,7 @@
 
 typedef struct {
 	ax25_address		user_addr, source_addr, dest_addr;
-	struct device		*device;
+	struct net_device		*device;
 	unsigned char		my_index,   my_id;
 	unsigned char		your_index, your_id;
 	unsigned char		state, condition, bpqext, window;
@@ -79,7 +79,7 @@
 	ax25_address    callsign;
 	ax25_digi       *digipeat;
 	ax25_cb		*ax25;
-	struct device   *dev;
+	struct net_device   *dev;
 	unsigned char   quality;
 	unsigned char   locked;
 	unsigned short  count;
@@ -114,12 +114,12 @@
 extern int  sysctl_netrom_transport_no_activity_timeout;
 extern int  sysctl_netrom_routing_control;
 extern int  sysctl_netrom_link_fails_count;
-extern int  nr_rx_frame(struct sk_buff *, struct device *);
+extern int  nr_rx_frame(struct sk_buff *, struct net_device *);
 extern void nr_destroy_socket(struct sock *);
 
 /* nr_dev.c */
-extern int  nr_rx_ip(struct sk_buff *, struct device *);
-extern int  nr_init(struct device *);
+extern int  nr_rx_ip(struct sk_buff *, struct net_device *);
+extern int  nr_init(struct net_device *);
 
 #include <net/nrcall.h>
 
@@ -141,9 +141,9 @@
 extern void nr_check_iframes_acked(struct sock *, unsigned short);
 
 /* nr_route.c */
-extern void nr_rt_device_down(struct device *);
-extern struct device *nr_dev_first(void);
-extern struct device *nr_dev_get(ax25_address *);
+extern void nr_rt_device_down(struct net_device *);
+extern struct net_device *nr_dev_first(void);
+extern struct net_device *nr_dev_get(ax25_address *);
 extern int  nr_rt_ioctl(unsigned int, void *);
 extern void nr_link_failed(ax25_cb *, int);
 extern int  nr_route_frame(struct sk_buff *, ax25_cb *);