ipv6: IPv6 over IEEE1394 (RFC3146) support.

CC Stephan Gatzka <[email protected]>

CC Stefan Richter <[email protected]>

Signed-off-by YOSHIFUJI Hideaki <[email protected]>

---
 include/net/ndisc.h |   14 +++++++++++-
 net/ipv6/addrconf.c |    4 +++-
 net/ipv6/ndisc.c    |   60 +++++++++++++++++++++++++++++++++++++++++++++++----
 net/ipv6/route.c    |    2 ++
 4 files changed, 74 insertions(+), 6 deletions(-)

include/net/ndisc.h +13 -1

index 3c53257..1de4e0c 100644
@@ -52,6 +52,7 @@ enum {
 #include <linux/hash.h>
 
 #include <net/neighbour.h>
+#include <net/firewire.h>
 
 struct ctl_table;
 struct inet6_dev;

@@ -127,10 +128,19 @@ static int ndisc_addr_option_pad(unsigned short type)
 	}
 }
 
+static int ndisc_addr_option_postpad(unsigned short type)
+{
+	switch (type) {
+	case ARPHRD_IEEE1394:	return sizeof(struct fwnet_peerinfo);
+	default:		return 0;
+	}
+}
+
 static inline int ndisc_opt_addr_space(struct net_device *dev)
 {
 	return NDISC_OPT_SPACE(dev->addr_len +
-			       ndisc_addr_option_pad(dev->type));
+			       ndisc_addr_option_pad(dev->type) +
+			       ndisc_addr_option_postpad(dev->type));
 }
 
 static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p,

@@ -203,6 +213,8 @@ extern void			ndisc_send_redirect(struct sk_buff *skb,
 extern int			ndisc_mc_map(const struct in6_addr *addr, char *buf,
 					     struct net_device *dev, int dir);
 
+extern void			ndisc_update_peerinfo(struct net_device *dev,
+						      void *lladdr);
 
 /*
  *	IGMP

net/ipv6/addrconf.c +3 -1

index 408cac4a..9a0728a 100644
@@ -1729,6 +1729,7 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
 	case ARPHRD_IPGRE:
 		return addrconf_ifid_gre(eui, dev);
 	case ARPHRD_IEEE802154:
+	case ARPHRD_IEEE1394:
 		return addrconf_ifid_eui64(eui, dev);
 	}
 	return -1;

@@ -2571,7 +2572,8 @@ static void addrconf_dev_config(struct net_device *dev)
 	    (dev->type != ARPHRD_FDDI) &&
 	    (dev->type != ARPHRD_ARCNET) &&
 	    (dev->type != ARPHRD_INFINIBAND) &&
-	    (dev->type != ARPHRD_IEEE802154)) {
+	    (dev->type != ARPHRD_IEEE802154) &&
+	    (dev->type != ARPHRD_IEEE1394)) {
 		/* Alas, we support only Ethernet autoconfiguration. */
 		return;
 	}

net/ipv6/ndisc.c +2 -0

index 99cd286..9a0ba9c 100644
@@ -72,6 +72,8 @@
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv6.h>
 
+#include <net/firewire.h>
+
 /* Set to 3 to get tracing... */
 #define ND_DEBUG 1
 

@@ -143,6 +145,22 @@ struct neigh_table nd_tbl = {
 	.gc_thresh3 =	1024,
 };

net/ipv6/ndisc.c +22 -3

+	if (space > 0)
+		memset(opt, 0, space);
+
+	return opt + space;
+}
+#endif
+
 static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,
 				  struct net_device *dev)
 {

@@ -160,9 +178,20 @@ static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,
 	memcpy(opt+2, data, data_len);
 	data_len += 2;
 	opt += data_len;
-	if ((space -= data_len) > 0)
-		memset(opt, 0, space);
-	return opt + space;
+
+	if ((space -= data_len) > 0) {
+		switch (dev->type) {
+#if defined(CONFIG_FIREWIRE_NET)
+		case ARPHRD_IEEE1394:
+			opt = __ndisc_fill_addr_option_firewire_postpad(opt, space,
+									data, dev);
+#endif
+		default:
+			memset(opt, 0, space);
+			opt += space;
+		}
+	}
+	return opt;
 }
 
 static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,

@@ -366,6 +395,19 @@ static void pndisc_destructor(struct pneigh_entry *n)
 	ipv6_dev_mc_dec(dev, &maddr);
 }
 
+void ndisc_update_peerinfo(struct net_device *dev, void *lladdr)

Dito, please do not solve this with an EXPORT from drivers/firewire/net.c.

Either a new driver callback is required, and the function pointer to this callback needs to be reachable indirectly via the skb pointer.

Or drivers/firewire/net.c needs to be aware that it just received an NDP packet, and then call a parser function in net/ipv6/ndisc.c which returns the data that drivers/firewire/net.c wants to know.

Quoted 16 lines · On Jan 12 YOSHIFUJI Hideaki wrote:

static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,

net/ipv6/ndisc.c +11 -0

@@ -366,6 +395,19 @@ static void pndisc_destructor(struct pneigh_entry *n)
 	ipv6_dev_mc_dec(dev, &maddr);
 }
 
+void ndisc_update_peerinfo(struct net_device *dev, void *lladdr)
+{
+#if defined(CONFIG_FIREWIRE_NET)
+	switch (dev->type) {
+	case ARPHRD_IEEE1394:
+		fwnet_update_peerinfo(dev, lladdr, (struct fwnet_peerinfo *)((__u64 *)lladdr + 1));
+		break;
+	default:
+		break;
+	}
+#endif

[...]

Dito, please do not solve this with an EXPORT from drivers/firewire/net.c.

Either a new driver callback is required, and the function pointer to this callback needs to be reachable indirectly via the skb pointer.

Or drivers/firewire/net.c needs to be aware that it just received an NDP packet, and then call a parser function in net/ipv6/ndisc.c which returns the data that drivers/firewire/net.c wants to know.

How about putting EUI64, maxrec, sspd and fifo in dev->dev_addr? This enable us to send NDISC/ARP packet easily (based on neighbor cache entry), and driver can be notified for new neighbors (thus new peers).

Quoted 4 lines

How about putting EUI64, maxrec, sspd and fifo in dev->dev_addr? This enable us to send NDISC/ARP packet easily (based on neighbor cache entry), and driver can be notified for new neighbors (thus new peers).

Hm, that looks a bit strange to me, because we need that only for link layer option packets and not for every IPv6 packet transmitted via firewire.