patch-2.3.14 linux/net/ipv4/rarp.c

Next file: linux/net/ipv4/route.c
Previous file: linux/net/ipv4/ipmr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/net/ipv4/rarp.c linux/net/ipv4/rarp.c
@@ -83,12 +83,12 @@
 	unsigned char      ha[MAX_ADDR_LEN];  /* Hardware address            */
 	unsigned char      hlen;              /* Length of hardware address  */
 	unsigned char      htype;             /* Type of hardware in use     */
-	struct device      *dev;              /* Device the entry is tied to */
+	struct net_device      *dev;              /* Device the entry is tied to */
 };
 
 struct rarp_table *rarp_tables = NULL;
 
-static int rarp_rcv(struct sk_buff *, struct device *, struct packet_type *);
+static int rarp_rcv(struct sk_buff *, struct net_device *, struct packet_type *);
 
 static struct packet_type rarp_packet_type =
 {
@@ -142,7 +142,7 @@
  *	Flush a device.
  */
 
-static void rarp_destroy_dev(struct device *dev)
+static void rarp_destroy_dev(struct net_device *dev)
 {
 	struct rarp_table *entry;
 	struct rarp_table **pentry;
@@ -166,7 +166,7 @@
 {
 	if(event!=NETDEV_DOWN)
 		return NOTIFY_DONE;
-	rarp_destroy_dev((struct device *)ptr);
+	rarp_destroy_dev((struct net_device *)ptr);
 	return NOTIFY_DONE;
 }
 
@@ -210,7 +210,7 @@
  *	"overhead" time isn't that high...
  */
 
-static int rarp_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *pt)
+static int rarp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
 {
 /*
  *	We shouldn't use this type conversion. Check later.
@@ -305,7 +305,7 @@
 	int htype, hlen;
 	unsigned long ip;
 	struct rtable *rt;
-	struct device * dev;
+	struct net_device * dev;
 	int err; 
   
 	err = copy_from_user(&r, req, sizeof(r));

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