Re: [PATCH] Use dev_port for the ID of a network device.
From: Thadeu Lima de Souza Cascardo <hidden>
Date: 2014-07-01 12:26:44
On Tue, Jul 01, 2014 at 08:45:56AM +0200, Bjørn Mork wrote:
Thadeu Lima de Souza Cascardo [off-list ref] writes:quoted
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index c80c30a..6de9c98 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c@@ -186,9 +186,14 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { return -ENOENT; /* kernel provided multi-device index */ - attr = udev_device_get_sysattr_value(dev, "dev_id"); - if (attr) + attr = udev_device_get_sysattr_value(dev, "dev_port"); + if (attr) { dev_id = strtol(attr, NULL, 16); + } else { + attr = udev_device_get_sysattr_value(dev, "dev_id"); + if (attr) + dev_id = strtol(attr, NULL, 16); + } /* compose a name based on the raw kernel's PCI bus, slot numbers */ s = names->pci_path;Note that the base of the new attribute is 10, not 16: bjorn@nemi:/usr/local/src/git/linux$ git grep dev_port net/core/ net/core/net-sysfs.c:NETDEVICE_SHOW_RO(dev_port, fmt_dec); net/core/net-sysfs.c: &dev_attr_dev_port.attr, bjorn@nemi:/usr/local/src/git/linux$ git grep dev_id net/core/ net/core/net-sysfs.c:NETDEVICE_SHOW_RO(dev_id, fmt_hex); net/core/net-sysfs.c: &dev_attr_dev_id.attr, Bjørn
Thanks for noticing, I'll fix that. Cascardo.