|
|
@@ -1093,6 +1093,7 @@ static int be_change_mtu(struct net_device *netdev, int new_mtu)
|
|
|
*/
|
|
|
static int be_vid_config(struct be_adapter *adapter)
|
|
|
{
|
|
|
+ struct device *dev = &adapter->pdev->dev;
|
|
|
u16 vids[BE_NUM_VLANS_SUPPORTED];
|
|
|
u16 num = 0, i = 0;
|
|
|
int status = 0;
|
|
|
@@ -1114,16 +1115,15 @@ static int be_vid_config(struct be_adapter *adapter)
|
|
|
if (addl_status(status) ==
|
|
|
MCC_ADDL_STATUS_INSUFFICIENT_RESOURCES)
|
|
|
goto set_vlan_promisc;
|
|
|
- dev_err(&adapter->pdev->dev,
|
|
|
- "Setting HW VLAN filtering failed.\n");
|
|
|
+ dev_err(dev, "Setting HW VLAN filtering failed\n");
|
|
|
} else {
|
|
|
if (adapter->flags & BE_FLAGS_VLAN_PROMISC) {
|
|
|
/* hw VLAN filtering re-enabled. */
|
|
|
status = be_cmd_rx_filter(adapter,
|
|
|
BE_FLAGS_VLAN_PROMISC, OFF);
|
|
|
if (!status) {
|
|
|
- dev_info(&adapter->pdev->dev,
|
|
|
- "Disabling VLAN Promiscuous mode.\n");
|
|
|
+ dev_info(dev,
|
|
|
+ "Disabling VLAN Promiscuous mode\n");
|
|
|
adapter->flags &= ~BE_FLAGS_VLAN_PROMISC;
|
|
|
}
|
|
|
}
|
|
|
@@ -1137,11 +1137,10 @@ set_vlan_promisc:
|
|
|
|
|
|
status = be_cmd_rx_filter(adapter, BE_FLAGS_VLAN_PROMISC, ON);
|
|
|
if (!status) {
|
|
|
- dev_info(&adapter->pdev->dev, "Enable VLAN Promiscuous mode\n");
|
|
|
+ dev_info(dev, "Enable VLAN Promiscuous mode\n");
|
|
|
adapter->flags |= BE_FLAGS_VLAN_PROMISC;
|
|
|
} else
|
|
|
- dev_err(&adapter->pdev->dev,
|
|
|
- "Failed to enable VLAN Promiscuous mode.\n");
|
|
|
+ dev_err(dev, "Failed to enable VLAN Promiscuous mode\n");
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
@@ -3387,7 +3386,7 @@ static int be_get_sriov_config(struct be_adapter *adapter)
|
|
|
|
|
|
if (!be_max_vfs(adapter)) {
|
|
|
if (num_vfs)
|
|
|
- dev_warn(dev, "device doesn't support SRIOV\n");
|
|
|
+ dev_warn(dev, "SRIOV is disabled. Ignoring num_vfs\n");
|
|
|
adapter->num_vfs = 0;
|
|
|
return 0;
|
|
|
}
|
|
|
@@ -3661,7 +3660,7 @@ static int be_setup(struct be_adapter *adapter)
|
|
|
dev_info(dev, "FW version is %s\n", adapter->fw_ver);
|
|
|
|
|
|
if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) {
|
|
|
- dev_err(dev, "Firmware on card is old(%s), IRQs may not work.",
|
|
|
+ dev_err(dev, "Firmware on card is old(%s), IRQs may not work",
|
|
|
adapter->fw_ver);
|
|
|
dev_err(dev, "Please upgrade firmware to version >= 4.0\n");
|
|
|
}
|