patch-2.3.14 linux/net/decnet/dn_neigh.c

Next file: linux/net/decnet/dn_route.c
Previous file: linux/net/decnet/dn_fib.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/net/decnet/dn_neigh.c linux/net/decnet/dn_neigh.c
@@ -127,7 +127,7 @@
 
 static int dn_neigh_construct(struct neighbour *neigh)
 {
-	struct device *dev = neigh->dev;
+	struct net_device *dev = neigh->dev;
 	struct dn_neigh *dn = (struct dn_neigh *)neigh;
 	struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
 
@@ -222,7 +222,7 @@
 {
 	struct dst_entry *dst = skb->dst;
 	struct neighbour *neigh = dst->neighbour;
-	struct device *dev = neigh->dev;
+	struct net_device *dev = neigh->dev;
 	struct dn_dev *dn_db = dev->dn_ptr;
 	int headroom = dev->hard_header_len + sizeof(struct dn_long_packet) + 3;
 	unsigned char *data;
@@ -277,7 +277,7 @@
 {
 	struct dst_entry *dst = skb->dst;
 	struct neighbour *neigh = dst->neighbour;
-	struct device *dev = neigh->dev;
+	struct net_device *dev = neigh->dev;
 	int headroom = dev->hard_header_len + sizeof(struct dn_short_packet) + 2;
 	struct dn_short_packet *sp;
 	unsigned char *data;
@@ -325,7 +325,7 @@
 {
 	struct dst_entry *dst = skb->dst;
 	struct neighbour *neigh = dst->neighbour;
-	struct device *dev = neigh->dev;
+	struct net_device *dev = neigh->dev;
 	int headroom = dev->hard_header_len + sizeof(struct dn_short_packet) + 2;
 	struct dn_short_packet *sp;
 	unsigned char *data;
@@ -507,7 +507,7 @@
 	return (*min < priority) ? (min - 6) : NULL;
 }
 
-int dn_neigh_elist(struct device *dev, unsigned char *ptr, int n)
+int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n)
 {
 	int t = 0;
 	int i;

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