From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 Feb 2014 20:38:18 +0000 (-0500)
Subject: Merge branch 'mlx4'
X-Git-Tag: v3.15-rc1~113^2~263
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=941ee45c4cd0ef492f5981c73434fae523e711c8;p=~emulex%2Finfiniband.git

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>
---

941ee45c4cd0ef492f5981c73434fae523e711c8