adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

firewire: net: add Kconfig item, rename driver

Browse source 
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>
This commit is contained in:
Stefan Richter 2009-06-07 22:57:53 +02:00
parent c76acec6d5
commit b9530fd6c3
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/firewire/Kconfig
View file

@ -77,3 +77,15 @@ config FIREWIRE_SBP2
You should also enable support for disks, CD-ROMs, etc. in the SCSI You should also enable support for disks, CD-ROMs, etc. in the SCSI
configuration section. 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.

6
drivers/firewire/Makefile
View file

@ -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 core-iso.o core-topology.o core-transaction.o
firewire-ohci-y += ohci.o firewire-ohci-y += ohci.o
firewire-sbp2-y += sbp2.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_OHCI) += firewire-ohci.o
obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o
obj-$(CONFIG_FIREWIRE_IPV4) += firewire-ipv4.o obj-$(CONFIG_FIREWIRE_NET) += firewire-net.o

2
drivers/firewire/fw-ipv4.c → drivers/firewire/net.c
View file

@ -1633,7 +1633,7 @@ static int ipv4_probe ( struct device *dev ) {
return added; return added;
} }
fw_debug("ipv4 Local: adding netdev\n" ); 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) { if ( netdev == NULL) {
fw_error( "Out of memory\n"); fw_error( "Out of memory\n");
goto out; goto out;

2
drivers/ieee1394/Kconfig
View file

@ -105,7 +105,7 @@ config IEEE1394_ETH1394_ROM_ENTRY
default n default n
config IEEE1394_ETH1394 config IEEE1394_ETH1394
tristate "IP over 1394" tristate "IP networking over 1394"
depends on IEEE1394 && EXPERIMENTAL && INET depends on IEEE1394 && EXPERIMENTAL && INET
select IEEE1394_ETH1394_ROM_ENTRY select IEEE1394_ETH1394_ROM_ENTRY
help help