diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-06-07 22:57:53 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-06-14 14:26:29 +0200 |
| commit | b9530fd6c3f057bda258c8e2631ad1a25959f4a2 (patch) | |
| tree | 509bc37394a27822b0a98b940f38d4c0401a4a6a /drivers | |
| parent | c76acec6d55107b652a37c90b36c00bc8b04dabb (diff) | |
| download | linux-b9530fd6c3f057bda258c8e2631ad1a25959f4a2.tar.gz | |
firewire: net: add Kconfig item, rename driver
The driver is now called firewire-net. It might implement the transport
of other networking protocols in the future, notably IPv6 per RFC 3146.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firewire/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/firewire/Makefile | 6 | ||||
| -rw-r--r-- | drivers/firewire/net.c (renamed from drivers/firewire/fw-ipv4.c) | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/Kconfig | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index 4509024382081c..d6b1721e52abc4 100644 --- a/drivers/firewire/Kconfig +++ b/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/drivers/firewire/Makefile b/drivers/firewire/Makefile index 31edf30c558d2a..a8f9bb6d9fdfb9 100644 --- a/drivers/firewire/Makefile +++ b/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/drivers/firewire/fw-ipv4.c b/drivers/firewire/net.c index 4de6dbb95f0cc9..15353886bd8088 100644 --- a/drivers/firewire/fw-ipv4.c +++ b/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/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index 95f45f9b8e5efc..584245881f4a46 100644 --- a/drivers/ieee1394/Kconfig +++ b/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 |