Skip to content

Commit

Permalink
drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN …
Browse files Browse the repository at this point in the history
…properties

Use separate table for alias entries in the ehea module, otherwise the
probe() function will operate on the separate ports instead of the
lhea-"root" entry of the device-tree

Addresses https://bugzilla.novell.com/show_bug.cgi?id=435215

[ Thadeu notes that: "... this issue might happen with the generation of
  initrd, when the scripts check for /sys/class/net/eth0/device/modalias,
  which links to the port device at
  /sys/devices/ibmebus/23c00400.lhea/port0/" ]

Signed-off-by: Jeff Mahoney <[email protected]>
Signed-off-by: Olaf Hering <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Acked-by: Thadeu Lima de Souza Cascardo <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
olafhering authored and davem330 committed Sep 17, 2013
1 parent 73a695f commit 7a3a621
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion drivers/net/ethernet/ibm/ehea/ehea_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,26 @@ static int ehea_probe_adapter(struct platform_device *dev);

static int ehea_remove(struct platform_device *dev);

static struct of_device_id ehea_module_device_table[] = {
{
.name = "lhea",
.compatible = "IBM,lhea",
},
{
.type = "network",
.compatible = "IBM,lhea-ethernet",
},
{},
};
MODULE_DEVICE_TABLE(of, ehea_module_device_table);

static struct of_device_id ehea_device_table[] = {
{
.name = "lhea",
.compatible = "IBM,lhea",
},
{},
};
MODULE_DEVICE_TABLE(of, ehea_device_table);

static struct platform_driver ehea_driver = {
.driver = {
Expand Down

0 comments on commit 7a3a621

Please sign in to comment.