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

Next file: linux/mm/filemap.c
Previous file: linux/include/net/ax25.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.11/linux/include/net/netrom.h linux/include/net/netrom.h
@@ -64,10 +64,21 @@
 	struct sock		*sk;		/* Backlink to socket */
 } nr_cb;
 
+struct nr_neigh {
+	struct nr_neigh *next;
+	ax25_address    callsign;
+	ax25_digi       *digipeat;
+	struct device   *dev;
+	unsigned char   quality;
+	unsigned char   locked;
+	unsigned short  count;
+	unsigned int    number;
+};
+
 struct nr_route {
-	unsigned char  quality;
-	unsigned char  obs_count;
-	unsigned short neighbour;
+	unsigned char   quality;
+	unsigned char   obs_count;
+	struct nr_neigh *neighbour;
 };
 
 struct nr_node {
@@ -77,17 +88,6 @@
 	unsigned char   which;
 	unsigned char   count;
 	struct nr_route routes[3];
-};
-
-struct nr_neigh {
-	struct nr_neigh *next;
-	ax25_address    callsign;
-	ax25_digi       *digipeat;
-	struct device   *dev;
-	unsigned char   quality;
-	unsigned char   locked;
-	unsigned short  count;
-	unsigned short  number;
 };
 
 /* af_netrom.c */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov