70093cfde8
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>
19 lines
588 B
C
19 lines
588 B
C
#ifndef _IEEE1394_CONFIG_ROMS_H
|
|
#define _IEEE1394_CONFIG_ROMS_H
|
|
|
|
struct hpsb_host;
|
|
|
|
int hpsb_default_host_entry(struct hpsb_host *host);
|
|
int hpsb_init_config_roms(void);
|
|
void hpsb_cleanup_config_roms(void);
|
|
|
|
/* List of flags to check if a host contains a certain extra config rom
|
|
* entry. Available in the host->config_roms member. */
|
|
#define HPSB_CONFIG_ROM_ENTRY_IP1394 0x00000001
|
|
|
|
#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY
|
|
int hpsb_config_rom_ip1394_add(struct hpsb_host *host);
|
|
void hpsb_config_rom_ip1394_remove(struct hpsb_host *host);
|
|
#endif
|
|
|
|
#endif /* _IEEE1394_CONFIG_ROMS_H */
|