AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-03-11 17:31:10 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/udev/udev-builtin-net_id.c: handle bcma buses

Browse Source 
This is upstream commits:

  984c4348ff14d29c526d3d372daa82e278eeb5b4
  f4ddacbd4de0f159ec598f8ad690466a84787ec5

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
Kay Sievers 2013-03-14 17:13:47 -04:00 committed by Anthony G. Basile
parent 803ecbcde2
commit a93a578bb0
1 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/udev/udev-builtin-net_id.c
View File

@ -94,6 +94,7 @@ enum netname_type{
NET_UNDEF,
NET_PCI,
NET_USB,
NET_BCMA,
};
struct netnames {
@ -108,8 +109,9 @@ struct netnames {
char pci_onboard[IFNAMSIZ];
const char *pci_onboard_label;
struct udev_device *usbdev;
char usb_ports[IFNAMSIZ];
char bcma_core[IFNAMSIZ];
};
/* retrieve on-board index number and label from firmware */
@ -265,6 +267,7 @@ static int names_pci(struct udev_device *dev, struct netnames *names) {
}
static int names_usb(struct udev_device *dev, struct netnames *names) {
struct udev_device *usbdev;
char name[256];
char *ports;
char *config;
@ -272,12 +275,12 @@ static int names_usb(struct udev_device *dev, struct netnames *names) {
size_t l;
char *s;
names->usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_interface");
if (!names->usbdev)
usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_interface");
if (!usbdev)
return -ENOENT;
/* get USB port number chain, configuration, interface */
util_strscpy(name, sizeof(name), udev_device_get_sysname(names->usbdev));
util_strscpy(name, sizeof(name), udev_device_get_sysname(usbdev));
s = strchr(name, '-');
if (!s)
return -EINVAL;
@ -316,6 +319,25 @@ static int names_usb(struct udev_device *dev, struct netnames *names) {
return 0;
}
static int names_bcma(struct udev_device *dev, struct netnames *names) {
struct udev_device *bcmadev;
unsigned int core;
bcmadev = udev_device_get_parent_with_subsystem_devtype(dev, "bcma", NULL);
if (!bcmadev)
return -ENOENT;
/* bus num:core num */
if (sscanf(udev_device_get_sysname(bcmadev), "bcma%*d:%d", &core) != 1)
return -EINVAL;
/* suppress the common core == 0 */
if (core > 0)
snprintf(names->bcma_core, sizeof(names->bcma_core), "b%d", core);
names->type = NET_BCMA;
return 0;
}
static int names_mac(struct udev_device *dev, struct netnames *names) {
const char *s;
unsigned int i;
@ -452,7 +474,24 @@ static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool
if (names.pci_slot[0])
if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_slot, names.usb_ports) < (int)sizeof(str))
udev_builtin_add_property(dev, test, "ID_NET_NAME_SLOT", str);
goto out;
}
/* Broadcom bus */
err = names_bcma(dev, &names);
if (err >= 0 && names.type == NET_BCMA) {
char str[IFNAMSIZ];
if (names.pci_path[0])
if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_path, names.bcma_core) < (int)sizeof(str))
udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str);
if (names.pci_slot[0])
if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_slot, names.bcma_core) < (int)sizeof(str))
udev_builtin_add_property(dev, test, "ID_NET_NAME_SLOT", str);
goto out;
}
out:
return EXIT_SUCCESS;
}