diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-26 15:38:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-26 15:38:18 -0500 |
| commit | 941ee45c4cd0ef492f5981c73434fae523e711c8 (patch) | |
| tree | fea8185e34cc0c359b70a23d174d8725cdfea066 /include/linux | |
| parent | f2ea0cfd6b5fb7daf4cf48bdc364f1cf9ef55d0c (diff) | |
| parent | ca9f9f703950e5cb300526549b4f1b0a6605a5c5 (diff) | |
Merge branch 'mlx4'
Amir Vadai says:
====================
net, net/mlx4: Add sysfs file for port number
Modern distro's are using biosdevname to rename interface to a name based on
slot/port number.
biosdevname can't get the port number of devices that have multiple ports that
share the same PCI function.
This patch adds a sysfs file under: /sys/devices/.../net/<interface>/dev_port,
that contains the port number (0 based) - to be used by biosdevname.
Also, dev_id was wrongly used in mlx4_en driver - added a patch that fix it.
This patch was tested and applied over commit 51adfcc "net: bcmgenet: remove
unused bh_lock member"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5e4756553c18..5e84483c0650 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1279,6 +1279,10 @@ struct net_device { * that share the same link * layer address */ + unsigned short dev_port; /* Used to differentiate + * devices that share the same + * function + */ spinlock_t addr_list_lock; struct netdev_hw_addr_list uc; /* Unicast mac addresses */ struct netdev_hw_addr_list mc; /* Multicast mac addresses */ |