---

yaml --- r: 153837 b: refs/heads/master c: b9530fd h: refs/heads/master i: 153835: 8175179 v: v3
git-mirror · Jun 14, 2009 · e2cc348 · e2cc348
1 parent a92ecd5
commit e2cc348
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c76acec6d55107b652a37c90b36c00bc8b04dabb
+refs/heads/master: b9530fd6c3f057bda258c8e2631ad1a25959f4a2
diff --git a/trunk/drivers/firewire/Kconfig b/trunk/drivers/firewire/Kconfig
@@ -77,3 +77,15 @@ config FIREWIRE_SBP2
 
 	  You should also enable support for disks, CD-ROMs, etc. in the SCSI
 	  configuration section.
+
+config FIREWIRE_NET
+	tristate "IP networking over 1394"
+	depends on FIREWIRE && INET
+	help
+	  This enables IPv4 over IEEE 1394, providing IP connectivity with
+	  other implementations of RFC 2734 as found on several operating
+	  systems.  Multicast support is currently limited.
+
+	  To compile this driver as a module, say M here:  The module will be
+	  called firewire-net.  It replaces eth1394 of the classic IEEE 1394
+	  stack.
diff --git a/trunk/drivers/firewire/Makefile b/trunk/drivers/firewire/Makefile
@@ -6,9 +6,9 @@ firewire-core-y += core-card.o core-cdev.o core-device.o \
                    core-iso.o core-topology.o core-transaction.o
 firewire-ohci-y += ohci.o
 firewire-sbp2-y += sbp2.o
-firewire-ipv4-y += fw-ipv4.o
+firewire-net-y  += net.o
 
-obj-$(CONFIG_FIREWIRE) += firewire-core.o
+obj-$(CONFIG_FIREWIRE)      += firewire-core.o
 obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o
 obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o
-obj-$(CONFIG_FIREWIRE_IPV4) += firewire-ipv4.o
+obj-$(CONFIG_FIREWIRE_NET)  += firewire-net.o
diff --git a/trunk/drivers/firewire/fw-ipv4.c → trunk/drivers/firewire/net.c b/trunk/drivers/firewire/fw-ipv4.c → trunk/drivers/firewire/net.c
@@ -1633,7 +1633,7 @@ static int ipv4_probe ( struct device *dev ) {
 		return added;
 	}
 	fw_debug("ipv4 Local: adding netdev\n" );
-	netdev = alloc_netdev ( sizeof(*priv), "fw-ipv4-%d", ipv4_init_dev );
+	netdev = alloc_netdev ( sizeof(*priv), "firewire%d", ipv4_init_dev );
 	if ( netdev == NULL) {
 		fw_error( "Out of memory\n");
 		goto out;

diff --git a/trunk/drivers/ieee1394/Kconfig b/trunk/drivers/ieee1394/Kconfig
@@ -105,7 +105,7 @@ config IEEE1394_ETH1394_ROM_ENTRY
 	default n
 
 config IEEE1394_ETH1394
-	tristate "IP over 1394"
+	tristate "IP networking over 1394"
 	depends on IEEE1394 && EXPERIMENTAL && INET
 	select IEEE1394_ETH1394_ROM_ENTRY
 	help