aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorVasundhara Volam <vasundhara.volam@emulex.com>2013-08-05 23:57:15 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-07 13:39:04 -0400
commitb971f847cd754bb75eb65bfcf60c750af67bedd2 (patch)
tree9faa6e76da9360ab1b4ce9916723a16d3988eed6 /drivers/net
parent0d0cffdcc6fc4f57080b9a443401e8dad5ca77f8 (diff)
be2net: Adding more speeds reported by get_settings
The new speeds are supported by variants of the Skyhawk-R chip. Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com> Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c6
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.h5
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 2bd2d1e4f9fe..ce15b1084ccb 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1464,6 +1464,12 @@ static int be_mac_to_link_speed(int mac_speed)
1464 return 1000; 1464 return 1000;
1465 case PHY_LINK_SPEED_10GBPS: 1465 case PHY_LINK_SPEED_10GBPS:
1466 return 10000; 1466 return 10000;
1467 case PHY_LINK_SPEED_20GBPS:
1468 return 20000;
1469 case PHY_LINK_SPEED_25GBPS:
1470 return 25000;
1471 case PHY_LINK_SPEED_40GBPS:
1472 return 40000;
1467 } 1473 }
1468 return 0; 1474 return 0;
1469} 1475}
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index eb541f0dfee8..9b916086c335 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -960,7 +960,10 @@ enum {
960 PHY_LINK_SPEED_10MBPS = 0x1, 960 PHY_LINK_SPEED_10MBPS = 0x1,
961 PHY_LINK_SPEED_100MBPS = 0x2, 961 PHY_LINK_SPEED_100MBPS = 0x2,
962 PHY_LINK_SPEED_1GBPS = 0x3, 962 PHY_LINK_SPEED_1GBPS = 0x3,
963 PHY_LINK_SPEED_10GBPS = 0x4 963 PHY_LINK_SPEED_10GBPS = 0x4,
964 PHY_LINK_SPEED_20GBPS = 0x5,
965 PHY_LINK_SPEED_25GBPS = 0x6,
966 PHY_LINK_SPEED_40GBPS = 0x7
964}; 967};
965 968
966struct be_cmd_resp_link_status { 969struct be_cmd_resp_link_status {