patch-2.1.79 linux/net/ipv6/sit.c

• Lines: 32
• Date: Mon Jan 12 15:28:28 1998
• Orig file: v2.1.78/linux/net/ipv6/sit.c
• Orig date: Mon Dec 1 12:04:17 1997

diff -u --recursive --new-file v2.1.78/linux/net/ipv6/sit.c linux/net/ipv6/sit.c
@@ -6,7 +6,7 @@
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *	Alexey Kuznetsov	<kuznet@ms2.inr.ac.ru>
  *
- *	$Id: sit.c,v 1.23 1997/11/08 18:15:49 kuznet Exp $
+ *	$Id: sit.c,v 1.24 1997/12/13 21:53:17 kuznet Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -393,18 +393,18 @@
 		goto tx_error;
 
 	if (!dst) {
-		struct nd_neigh *neigh = NULL;
+		struct neighbour *neigh = NULL;
 
 		if (skb->dst)
-			neigh = (struct nd_neigh *) skb->dst->neighbour;
+			neigh = skb->dst->neighbour;
 
 		if (neigh == NULL) {
 			printk(KERN_DEBUG "sit: nexthop == NULL\n");
 			goto tx_error;
 		}
 
-		addr6 = &neigh->ndn_addr;
-		addr_type = ipv6_addr_type(addr6);
+		addr6 = (struct in6_addr*)&neigh->primary_key;
+		addr_type = neigh->type;
 
 		if (addr_type == IPV6_ADDR_ANY) {
 			addr6 = &skb->nh.ipv6h->daddr;