aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorVasundhara Volam <vasundhara.volam@emulex.com>2014-09-12 08:09:14 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-13 17:12:15 -0400
commit50762667f78e346c343544f88270c0a831789e7d (patch)
tree46e297c7b31aae5a9f33610d9a9a5c414e60e60d /drivers/net/ethernet/emulex
parent233577a22089facf5271ab5e845b2262047c971f (diff)
be2net: fix some log messages
This patch fixes the following minor issues with log messages in be2net: 1) Period is not required at the end of log message. 2) Remove "Unknown grp5 event" logs to reduce noise. The driver can safely ignore async events from FW it's not interested in. 3) Reword a log message for better readability to say that SRIOV "is disabled" rather than "not supported". 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/ethernet/emulex')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c17
3 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 5be100d1bc0a..d6685aba892f 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -309,8 +309,6 @@ static void be_async_grp5_evt_process(struct be_adapter *adapter,
309 be_async_grp5_pvid_state_process(adapter, compl); 309 be_async_grp5_pvid_state_process(adapter, compl);
310 break; 310 break;
311 default: 311 default:
312 dev_warn(&adapter->pdev->dev, "Unknown grp5 event 0x%x!\n",
313 event_type);
314 break; 312 break;
315 } 313 }
316} 314}
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 2fd38261bedb..ee565be91e0c 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -676,7 +676,7 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)
676 status = be_cmd_set_flow_control(adapter, 676 status = be_cmd_set_flow_control(adapter,
677 adapter->tx_fc, adapter->rx_fc); 677 adapter->tx_fc, adapter->rx_fc);
678 if (status) 678 if (status)
679 dev_warn(&adapter->pdev->dev, "Pause param set failed.\n"); 679 dev_warn(&adapter->pdev->dev, "Pause param set failed\n");
680 680
681 return be_cmd_status(status); 681 return be_cmd_status(status);
682} 682}
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 5b26c4c9ab2b..f059b62d29b5 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1093,6 +1093,7 @@ static int be_change_mtu(struct net_device *netdev, int new_mtu)
1093 */ 1093 */
1094static int be_vid_config(struct be_adapter *adapter) 1094static int be_vid_config(struct be_adapter *adapter)
1095{ 1095{
1096 struct device *dev = &adapter->pdev->dev;
1096 u16 vids[BE_NUM_VLANS_SUPPORTED]; 1097 u16 vids[BE_NUM_VLANS_SUPPORTED];
1097 u16 num = 0, i = 0; 1098 u16 num = 0, i = 0;
1098 int status = 0; 1099 int status = 0;
@@ -1114,16 +1115,15 @@ static int be_vid_config(struct be_adapter *adapter)
1114 if (addl_status(status) == 1115 if (addl_status(status) ==
1115 MCC_ADDL_STATUS_INSUFFICIENT_RESOURCES) 1116 MCC_ADDL_STATUS_INSUFFICIENT_RESOURCES)
1116 goto set_vlan_promisc; 1117 goto set_vlan_promisc;
1117 dev_err(&adapter->pdev->dev, 1118 dev_err(dev, "Setting HW VLAN filtering failed\n");
1118 "Setting HW VLAN filtering failed.\n");
1119 } else { 1119 } else {
1120 if (adapter->flags & BE_FLAGS_VLAN_PROMISC) { 1120 if (adapter->flags & BE_FLAGS_VLAN_PROMISC) {
1121 /* hw VLAN filtering re-enabled. */ 1121 /* hw VLAN filtering re-enabled. */
1122 status = be_cmd_rx_filter(adapter, 1122 status = be_cmd_rx_filter(adapter,
1123 BE_FLAGS_VLAN_PROMISC, OFF); 1123 BE_FLAGS_VLAN_PROMISC, OFF);
1124 if (!status) { 1124 if (!status) {
1125 dev_info(&adapter->pdev->dev, 1125 dev_info(dev,
1126 "Disabling VLAN Promiscuous mode.\n"); 1126 "Disabling VLAN Promiscuous mode\n");
1127 adapter->flags &= ~BE_FLAGS_VLAN_PROMISC; 1127 adapter->flags &= ~BE_FLAGS_VLAN_PROMISC;
1128 } 1128 }
1129 } 1129 }
@@ -1137,11 +1137,10 @@ set_vlan_promisc:
1137 1137
1138 status = be_cmd_rx_filter(adapter, BE_FLAGS_VLAN_PROMISC, ON); 1138 status = be_cmd_rx_filter(adapter, BE_FLAGS_VLAN_PROMISC, ON);
1139 if (!status) { 1139 if (!status) {
1140 dev_info(&adapter->pdev->dev, "Enable VLAN Promiscuous mode\n"); 1140 dev_info(dev, "Enable VLAN Promiscuous mode\n");
1141 adapter->flags |= BE_FLAGS_VLAN_PROMISC; 1141 adapter->flags |= BE_FLAGS_VLAN_PROMISC;
1142 } else 1142 } else
1143 dev_err(&adapter->pdev->dev, 1143 dev_err(dev, "Failed to enable VLAN Promiscuous mode\n");
1144 "Failed to enable VLAN Promiscuous mode.\n");
1145 return status; 1144 return status;
1146} 1145}
1147 1146
@@ -3387,7 +3386,7 @@ static int be_get_sriov_config(struct be_adapter *adapter)
3387 3386
3388 if (!be_max_vfs(adapter)) { 3387 if (!be_max_vfs(adapter)) {
3389 if (num_vfs) 3388 if (num_vfs)
3390 dev_warn(dev, "device doesn't support SRIOV\n"); 3389 dev_warn(dev, "SRIOV is disabled. Ignoring num_vfs\n");
3391 adapter->num_vfs = 0; 3390 adapter->num_vfs = 0;
3392 return 0; 3391 return 0;
3393 } 3392 }
@@ -3661,7 +3660,7 @@ static int be_setup(struct be_adapter *adapter)
3661 dev_info(dev, "FW version is %s\n", adapter->fw_ver); 3660 dev_info(dev, "FW version is %s\n", adapter->fw_ver);
3662 3661
3663 if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) { 3662 if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) {
3664 dev_err(dev, "Firmware on card is old(%s), IRQs may not work.", 3663 dev_err(dev, "Firmware on card is old(%s), IRQs may not work",
3665 adapter->fw_ver); 3664 adapter->fw_ver);
3666 dev_err(dev, "Please upgrade firmware to version >= 4.0\n"); 3665 dev_err(dev, "Please upgrade firmware to version >= 4.0\n");
3667 } 3666 }