patch-2.4.0-test3 linux/net/decnet/dn_dev.c

• Lines: 19
• Date: Wed Jul 5 22:15:27 2000
• Orig file: v2.4.0-test2/linux/net/decnet/dn_dev.c
• Orig date: Thu Feb 10 17:11:24 2000

diff -u --recursive --new-file v2.4.0-test2/linux/net/decnet/dn_dev.c linux/net/decnet/dn_dev.c
@@ -911,7 +911,6 @@
 	}
 
 	dn_dev_set_timer(dev);
-	timer_exit(&dn_db->timer);
 }
 
 static void dn_dev_set_timer(struct net_device *dev)
@@ -1173,8 +1172,8 @@
 				dn_db->parms.blksize,
 				dn_db->parms.priority,
 				dn_db->parms.state, dn_db->parms.name,
-				dn_db->router ? dn_addr2asc(dn_eth2dn(dn_db->router->primary_key), router_buf) : "",
-				dn_db->peer ? dn_addr2asc(dn_eth2dn(dn_db->peer->primary_key), peer_buf) : "");
+				dn_db->router ? dn_addr2asc(dn_ntohs(*(dn_address *)dn_db->router->primary_key), router_buf) : "",
+				dn_db->peer ? dn_addr2asc(dn_ntohs(*(dn_address *)dn_db->peer->primary_key), peer_buf) : "");
 
 
                 pos = begin + len;