patch-2.3.14 linux/net/802/tr.c

• Lines: 56
• Date: Wed Aug 18 11:38:48 1999
• Orig file: v2.3.13/linux/net/802/tr.c
• Orig date: Sat Apr 24 17:51:48 1999

diff -u --recursive --new-file v2.3.13/linux/net/802/tr.c linux/net/802/tr.c
@@ -36,8 +36,8 @@
 #include <linux/init.h>
 #include <net/arp.h>
 
-static void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct device *dev);
-static void tr_add_rif_info(struct trh_hdr *trh, struct device *dev);
+static void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
+static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev);
 static void rif_check_expire(unsigned long dummy);
 
 #define TR_SR_DEBUG 0
@@ -85,7 +85,7 @@
  *	makes this a little more exciting than on ethernet.
  */
  
-int tr_header(struct sk_buff *skb, struct device *dev, unsigned short type,
+int tr_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
               void *daddr, void *saddr, unsigned len) 
 {
 	struct trh_hdr *trh;
@@ -144,7 +144,7 @@
 {
 	struct trh_hdr *trh=(struct trh_hdr *)skb->data;
 	struct trllc *trllc=(struct trllc *)(skb->data+sizeof(struct trh_hdr));
-	struct device *dev = skb->dev;
+	struct net_device *dev = skb->dev;
 
 	/*
 	 *	FIXME: We don't yet support IPv6 over token rings
@@ -173,7 +173,7 @@
  *	it via SNAP.
  */
  
-unsigned short tr_type_trans(struct sk_buff *skb, struct device *dev) 
+unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev) 
 {
 
 	struct trh_hdr *trh=(struct trh_hdr *)skb->data;
@@ -225,7 +225,7 @@
  *	We try to do source routing... 
  */
 
-static void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct device *dev) 
+static void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *dev) 
 {
 	int i, slack;
 	unsigned int hash;
@@ -313,7 +313,7 @@
  *	routing.
  */
  
-static void tr_add_rif_info(struct trh_hdr *trh, struct device *dev)
+static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
 {
 	int i;
 	unsigned int hash, rii_p = 0;