diff options
| author | David S. Miller | 2014-07-30 22:25:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-07-30 22:25:49 +0200 |
| commit | f139c74a8df071217dcd63f3ef06ae7be7071c4d (patch) | |
| tree | 5711f695577a18a06dbcd0101956e97b388ffa1a /drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | |
| parent | net: mvpp2: implement ioctl() operation for PHY ioctls (diff) | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| download | kernel-qcow2-linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.tar.gz kernel-qcow2-linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.tar.xz kernel-qcow2-linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index 08ea91cab738..92fee842f954 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c @@ -416,6 +416,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) break; case PORT_FIBRE: case PORT_DA: + case PORT_NONE: if (!(bp->port.supported[0] & SUPPORTED_FIBRE || bp->port.supported[1] & SUPPORTED_FIBRE)) { DP(BNX2X_MSG_ETHTOOL, |