ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts

Until now, ieee1394 put an IP-over-1394 capability entry into each new
host's config ROM.  As soon as the controller was initialized --- i.e.
right after modprobe ohci1394 --- this entry triggered a hotplug event
which typically caused auto-loading of eth1394.

This irritated or annoyed many users and distributors.  Of course they
could blacklist eth1394, but then ieee1394 wrongly advertized IP-over-
1394 capability to the FireWire bus.

Therefore
  - remove the offending kernel config option
    IEEE1394_CONFIG_ROM_IP1394,
  - let eth1394 add the ROM entry by itself, i.e. only after eth1394 was
    loaded.

This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7793 .

To emulate the behaviour of older kernels, simply add the following to
to /etc/modprobe.conf:

install ohci1394 /sbin/modprobe eth1394; \
                 /sbin/modprobe --ignore-install ohci1394

Note, autoloading of eth1394 when an _external_ IP-over-1394 capable
device is discovered is _not_ affected by this patch.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 9 insertions, 20 deletions

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index f8ff6b866e6e..5c0b522ae077 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -34,23 +34,6 @@ config IEEE1394_VERBOSEDEBUG
           Say Y if you really want or need the debugging output, everyone
           else says N.
 
-config IEEE1394_EXTRA_CONFIG_ROMS
-        bool "Build in extra config rom entries for certain functionality"
-        depends on IEEE1394
-        help
-          Some IEEE1394 functionality depends on extra config rom entries
-          being available in the host adapters CSR. These options will
-          allow you to choose which ones.
-
-config IEEE1394_CONFIG_ROM_IP1394
-        bool "IP-1394 Entry"
-        depends on IEEE1394_EXTRA_CONFIG_ROMS && IEEE1394
-        help
-          Adds an entry for using IP-over-1394. If you want to use your
-          IEEE1394 bus as a network for IP systems (including interacting
-          with MacOSX and WinXP IP-over-1394), enable this option and the
-          eth1394 option below.
-
 comment "Device Drivers"
         depends on IEEE1394
 
@@ -120,11 +103,15 @@ config IEEE1394_SBP2_PHYS_DMA
           This option is buggy and currently broken on some architectures.
           If unsure, say N.
 
+config IEEE1394_ETH1394_ROM_ENTRY
+        depends on IEEE1394
+        bool
+        default n
+
 config IEEE1394_ETH1394
-        tristate "Ethernet over 1394"
+        tristate "IP over 1394"
         depends on IEEE1394 && EXPERIMENTAL && INET
-        select IEEE1394_CONFIG_ROM_IP1394
-        select IEEE1394_EXTRA_CONFIG_ROMS
+        select IEEE1394_ETH1394_ROM_ENTRY
         help
           This driver implements a functional majority of RFC 2734: IPv4 over
           1394.  It will provide IP connectivity with implementations of RFC
@@ -133,6 +120,8 @@ config IEEE1394_ETH1394
           This driver is still considered experimental.  It does not yet support
           MCAP, therefore multicast support is significantly limited.
 
+          The module is called eth1394 although it does not emulate Ethernet.
+
 config IEEE1394_DV1394
         tristate "OHCI-DV I/O support (deprecated)"
         depends on IEEE1394 && IEEE1394_OHCI1394