5 files changed, 90 insertions, 41 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index cd213d967529..fead5c65a4f0 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -209,7 +209,6 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
 
         if (base_status != MCC_STATUS_SUCCESS &&
             !be_skip_err_log(opcode, base_status, addl_status)) {
-
                 if (base_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {
                         dev_warn(&adapter->pdev->dev,
                                  "VF is not privileged to issue opcode %d-%d\n",
@@ -317,7 +316,7 @@ static void be_async_dbg_evt_process(struct be_adapter *adapter,
                                      struct be_mcc_compl *cmp)
 {
         u8 event_type = 0;
-        struct be_async_event_qnq *evt = (struct be_async_event_qnq *) cmp;
+        struct be_async_event_qnq *evt = (struct be_async_event_qnq *)cmp;
 
         event_type = (cmp->flags >> ASYNC_EVENT_TYPE_SHIFT) &
                         ASYNC_EVENT_TYPE_MASK;
@@ -593,6 +592,7 @@ static int lancer_wait_ready(struct be_adapter *adapter)
 static bool lancer_provisioning_error(struct be_adapter *adapter)
 {
         u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
+
         sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
         if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
                 sliport_err1 = ioread32(adapter->db + SLIPORT_ERROR1_OFFSET);
@@ -675,7 +675,6 @@ int be_fw_wait_ready(struct be_adapter *adapter)
         return -1;
 }
 
-
 static inline struct be_sge *nonembedded_sgl(struct be_mcc_wrb *wrb)
 {
         return &wrb->payload.sgl[0];
@@ -922,6 +921,7 @@ int be_cmd_eq_create(struct be_adapter *adapter, struct be_eq_obj *eqo)
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_eq_create *resp = embedded_payload(wrb);
+
                 eqo->q.id = le16_to_cpu(resp->eq_id);
                 eqo->msix_idx =
                         (ver == 2) ? le16_to_cpu(resp->msix_idx) : eqo->idx;
@@ -956,7 +956,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
         if (permanent) {
                 req->permanent = 1;
         } else {
-                req->if_id = cpu_to_le16((u16) if_handle);
+                req->if_id = cpu_to_le16((u16)if_handle);
                 req->pmac_id = cpu_to_le32(pmac_id);
                 req->permanent = 0;
         }
@@ -964,6 +964,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_mac_query *resp = embedded_payload(wrb);
+
                 memcpy(mac_addr, resp->mac.addr, ETH_ALEN);
         }
 
@@ -1000,6 +1001,7 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_pmac_add *resp = embedded_payload(wrb);
+
                 *pmac_id = le32_to_cpu(resp->pmac_id);
         }
 
@@ -1032,7 +1034,8 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, int pmac_id, u32 dom)
         req = embedded_payload(wrb);
 
         be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req), wrb, NULL);
+                               OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req),
+                               wrb, NULL);
 
         req->hdr.domain = dom;
         req->if_id = cpu_to_le32(if_id);
@@ -1104,6 +1107,7 @@ int be_cmd_cq_create(struct be_adapter *adapter, struct be_queue_info *cq,
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_cq_create *resp = embedded_payload(wrb);
+
                 cq->id = le16_to_cpu(resp->cq_id);
                 cq->created = true;
         }
@@ -1116,6 +1120,7 @@ int be_cmd_cq_create(struct be_adapter *adapter, struct be_queue_info *cq,
 static u32 be_encoded_q_len(int q_len)
 {
         u32 len_encoded = fls(q_len); /* log2(len) + 1 */
+
         if (len_encoded == 16)
                 len_encoded = 0;
         return len_encoded;
@@ -1171,6 +1176,7 @@ static int be_cmd_mccq_ext_create(struct be_adapter *adapter,
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_mcc_create *resp = embedded_payload(wrb);
+
                 mccq->id = le16_to_cpu(resp->id);
                 mccq->created = true;
         }
@@ -1214,6 +1220,7 @@ static int be_cmd_mccq_org_create(struct be_adapter *adapter,
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_mcc_create *resp = embedded_payload(wrb);
+
                 mccq->id = le16_to_cpu(resp->id);
                 mccq->created = true;
         }
@@ -1272,6 +1279,7 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo)
         status = be_cmd_notify_wait(adapter, &wrb);
         if (!status) {
                 struct be_cmd_resp_eth_tx_create *resp = embedded_payload(&wrb);
+
                 txq->id = le16_to_cpu(resp->cid);
                 if (ver == 2)
                         txo->db_offset = le32_to_cpu(resp->db_offset);
@@ -1316,6 +1324,7 @@ int be_cmd_rxq_create(struct be_adapter *adapter,
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_eth_rx_create *resp = embedded_payload(wrb);
+
                 rxq->id = le16_to_cpu(resp->id);
                 rxq->created = true;
                 *rss_id = resp->rss_id;
@@ -1429,6 +1438,7 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
         status = be_cmd_notify_wait(adapter, &wrb);
         if (!status) {
                 struct be_cmd_resp_if_create *resp = embedded_payload(&wrb);
+
                 *if_handle = le32_to_cpu(resp->interface_id);
 
                 /* Hack to retrieve VF's pmac-id on BE3 */
@@ -1512,7 +1522,6 @@ err:
 int lancer_cmd_get_pport_stats(struct be_adapter *adapter,
                                struct be_dma_mem *nonemb_cmd)
 {
-
         struct be_mcc_wrb *wrb;
         struct lancer_cmd_req_pport_stats *req;
         int status = 0;
@@ -1603,6 +1612,7 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u16 *link_speed,
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_link_status *resp = embedded_payload(wrb);
+
                 if (link_speed) {
                         *link_speed = resp->link_speed ?
                                       le16_to_cpu(resp->link_speed) * 10 :
@@ -1670,6 +1680,7 @@ int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size)
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_get_fat *resp = embedded_payload(wrb);
+
                 if (log_size && resp->log_size)
                         *log_size = le32_to_cpu(resp->log_size) -
                                         sizeof(u32);
@@ -1699,7 +1710,7 @@ int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
                                               &get_fat_cmd.dma);
         if (!get_fat_cmd.va) {
                 dev_err(&adapter->pdev->dev,
-                "Memory allocation failure while retrieving FAT data\n");
+                        "Memory allocation failure while reading FAT data\n");
                 return -ENOMEM;
         }
 
@@ -1729,6 +1740,7 @@ int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
                 status = be_mcc_notify_wait(adapter);
                 if (!status) {
                         struct be_cmd_resp_get_fat *resp = get_fat_cmd.va;
+
                         memcpy(buf + offset,
                                resp->data_buffer,
                                le32_to_cpu(resp->read_log_length));
@@ -1783,8 +1795,8 @@ err:
 /* set the EQ delay interval of an EQ to specified value
  * Uses async mcc
  */
-int __be_cmd_modify_eqd(struct be_adapter *adapter, struct be_set_eqd *set_eqd,
-                        int num)
+static int __be_cmd_modify_eqd(struct be_adapter *adapter,
+                               struct be_set_eqd *set_eqd, int num)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_modify_eq_delay *req;
@@ -1899,8 +1911,8 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
                                             BE_IF_FLAGS_VLAN_PROMISCUOUS |
                                             BE_IF_FLAGS_MCAST_PROMISCUOUS);
         } else if (flags & IFF_ALLMULTI) {
-                req->if_flags_mask = req->if_flags =
-                                cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
+                req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
+                req->if_flags = cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
         } else if (flags & BE_FLAGS_VLAN_PROMISC) {
                 req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_VLAN_PROMISCUOUS);
 
@@ -1911,8 +1923,8 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
                 struct netdev_hw_addr *ha;
                 int i = 0;
 
-                req->if_flags_mask = req->if_flags =
-                                cpu_to_le32(BE_IF_FLAGS_MULTICAST);
+                req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_MULTICAST);
+                req->if_flags = cpu_to_le32(BE_IF_FLAGS_MULTICAST);
 
                 /* Reset mcast promisc mode if already set by setting mask
                  * and not setting flags field
@@ -2010,6 +2022,7 @@ int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc)
         if (!status) {
                 struct be_cmd_resp_get_flow_control *resp =
                                                 embedded_payload(wrb);
+
                 *tx_fc = le16_to_cpu(resp->tx_flow_control);
                 *rx_fc = le16_to_cpu(resp->rx_flow_control);
         }
@@ -2039,6 +2052,7 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter)
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_query_fw_cfg *resp = embedded_payload(wrb);
+
                 adapter->port_num = le32_to_cpu(resp->phys_port);
                 adapter->function_mode = le32_to_cpu(resp->function_mode);
                 adapter->function_caps = le32_to_cpu(resp->function_caps);
@@ -2187,6 +2201,7 @@ int be_cmd_get_beacon_state(struct be_adapter *adapter, u8 port_num, u32 *state)
         if (!status) {
                 struct be_cmd_resp_get_beacon_state *resp =
                                                 embedded_payload(wrb);
+
                 *state = resp->beacon_state;
         }
 
@@ -2457,7 +2472,7 @@ err_unlock:
 }
 
 int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,
-                          u16 optype, int offset)
+                         u16 optype, int offset)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_read_flash_crc *req;
@@ -2628,9 +2643,10 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
 
         if (!status) {
                 struct be_cmd_resp_ddrdma_test *resp;
+
                 resp = cmd->va;
                 if ((memcmp(resp->rcv_buff, req->snd_buff, byte_cnt) != 0) ||
-                                resp->snd_err) {
+                    resp->snd_err) {
                         status = -1;
                 }
         }
@@ -2703,6 +2719,7 @@ int be_cmd_get_phy_info(struct be_adapter *adapter)
         if (!status) {
                 struct be_phy_info *resp_phy_info =
                                 cmd.va + sizeof(struct be_cmd_req_hdr);
+
                 adapter->phy.phy_type = le16_to_cpu(resp_phy_info->phy_type);
                 adapter->phy.interface_type =
                         le16_to_cpu(resp_phy_info->interface_type);
@@ -2832,6 +2849,7 @@ int be_cmd_req_native_mode(struct be_adapter *adapter)
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_set_func_cap *resp = embedded_payload(wrb);
+
                 adapter->be3_native = le32_to_cpu(resp->cap_flags) &
                                         CAPABILITY_BE3_NATIVE_ERX_API;
                 if (!adapter->be3_native)
@@ -2871,6 +2889,7 @@ int be_cmd_get_fn_privileges(struct be_adapter *adapter, u32 *privilege,
         if (!status) {
                 struct be_cmd_resp_get_fn_privileges *resp =
                                                 embedded_payload(wrb);
+
                 *privilege = le32_to_cpu(resp->privilege_mask);
 
                 /* In UMC mode FW does not return right privileges.
@@ -3018,7 +3037,6 @@ out:
 int be_cmd_get_active_mac(struct be_adapter *adapter, u32 curr_pmac_id,
                           u8 *mac, u32 if_handle, bool active, u32 domain)
 {
-
         if (!active)
                 be_cmd_get_mac_from_list(adapter, mac, &active, &curr_pmac_id,
                                          if_handle, domain);
@@ -3202,6 +3220,7 @@ int be_cmd_get_hsw_config(struct be_adapter *adapter, u16 *pvid,
         if (!status) {
                 struct be_cmd_resp_get_hsw_config *resp =
                                                 embedded_payload(wrb);
+
                 be_dws_le_to_cpu(&resp->context, sizeof(resp->context));
                 vid = AMAP_GET_BITS(struct amap_get_hsw_resp_context,
                                     pvid, &resp->context);
@@ -3261,7 +3280,8 @@ int be_cmd_get_acpi_wol_cap(struct be_adapter *adapter)
         status = be_mbox_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_acpi_wol_magic_config_v1 *resp;
-                resp = (struct be_cmd_resp_acpi_wol_magic_config_v1 *) cmd.va;
+
+                resp = (struct be_cmd_resp_acpi_wol_magic_config_v1 *)cmd.va;
 
                 adapter->wol_cap = resp->wol_settings;
                 if (adapter->wol_cap & BE_WOL_CAP)
@@ -3297,6 +3317,7 @@ int be_cmd_set_fw_log_level(struct be_adapter *adapter, u32 level)
                         (extfat_cmd.va + sizeof(struct be_cmd_resp_hdr));
         for (i = 0; i < le32_to_cpu(cfgs->num_modules); i++) {
                 u32 num_modes = le32_to_cpu(cfgs->module[i].num_modes);
+
                 for (j = 0; j < num_modes; j++) {
                         if (cfgs->module[i].trace_lvl[j].mode == MODE_UART)
                                 cfgs->module[i].trace_lvl[j].dbg_lvl =
@@ -3333,6 +3354,7 @@ int be_cmd_get_fw_log_level(struct be_adapter *adapter)
         if (!status) {
                 cfgs = (struct be_fat_conf_params *)(extfat_cmd.va +
                                                 sizeof(struct be_cmd_resp_hdr));
+
                 for (j = 0; j < le32_to_cpu(cfgs->module[0].num_modes); j++) {
                         if (cfgs->module[0].trace_lvl[j].mode == MODE_UART)
                                 level = cfgs->module[0].trace_lvl[j].dbg_lvl;
@@ -3429,6 +3451,7 @@ int be_cmd_query_port_name(struct be_adapter *adapter, u8 *port_name)
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_get_port_name *resp = embedded_payload(wrb);
+
                 *port_name = resp->port_name[adapter->hba_port_num];
         } else {
                 *port_name = adapter->hba_port_num + '0';
@@ -4052,6 +4075,7 @@ int be_cmd_get_active_profile(struct be_adapter *adapter, u16 *profile_id)
         if (!status) {
                 struct be_cmd_resp_get_active_profile *resp =
                                                         embedded_payload(wrb);
+
                 *profile_id = le16_to_cpu(resp->active_profile_id);
         }
 
@@ -4104,7 +4128,7 @@ int be_roce_mcc_cmd(void *netdev_handle, void *wrb_payload,
 {
         struct be_adapter *adapter = netdev_priv(netdev_handle);
         struct be_mcc_wrb *wrb;
-        struct be_cmd_req_hdr *hdr = (struct be_cmd_req_hdr *) wrb_payload;
+        struct be_cmd_req_hdr *hdr = (struct be_cmd_req_hdr *)wrb_payload;
         struct be_cmd_req_hdr *req;
         struct be_cmd_resp_hdr *resp;
         int status;
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index e86a5ef439dd..eb5085d6794f 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1005,8 +1005,8 @@ struct be_cmd_resp_link_status {
 /*    Identifies the type of port attached to NIC     */
 struct be_cmd_req_port_type {
         struct be_cmd_req_hdr hdr;
-        u32 page_num;
-        u32 port;
+        __le32 page_num;
+        __le32 port;
 };
 
 enum {
@@ -1374,6 +1374,7 @@ enum {
 #define BE_SUPPORTED_SPEED_100MBPS      2
 #define BE_SUPPORTED_SPEED_1GBPS        4
 #define BE_SUPPORTED_SPEED_10GBPS       8
+#define BE_SUPPORTED_SPEED_20GBPS       0x10
 #define BE_SUPPORTED_SPEED_40GBPS       0x20
 
 #define BE_AN_EN                        0x2
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 43b559570632..e42a791c1835 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -130,6 +130,7 @@ static const struct be_ethtool_stat et_stats[] = {
         {DRVSTAT_INFO(roce_drops_payload_len)},
         {DRVSTAT_INFO(roce_drops_crc)}
 };
+
 #define ETHTOOL_STATS_NUM ARRAY_SIZE(et_stats)
 
 /* Stats related to multi RX queues: get_stats routine assumes bytes, pkts
@@ -152,6 +153,7 @@ static const struct be_ethtool_stat et_rx_stats[] = {
          */
         {DRVSTAT_RX_INFO(rx_drops_no_frags)}
 };
+
 #define ETHTOOL_RXSTATS_NUM (ARRAY_SIZE(et_rx_stats))
 
 /* Stats related to multi TX queues: get_stats routine assumes compl is the
@@ -200,6 +202,7 @@ static const struct be_ethtool_stat et_tx_stats[] = {
         /* Pkts dropped in the driver's transmit path */
         {DRVSTAT_TX_INFO(tx_drv_drops)}
 };
+
 #define ETHTOOL_TXSTATS_NUM (ARRAY_SIZE(et_tx_stats))
 
 static const char et_self_tests[][ETH_GSTRING_LEN] = {
@@ -274,7 +277,7 @@ static int lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
 
         while ((total_read_len < buf_len) && !eof) {
                 chunk_size = min_t(u32, (buf_len - total_read_len),
-                                LANCER_READ_FILE_CHUNK);
+                                   LANCER_READ_FILE_CHUNK);
                 chunk_size = ALIGN(chunk_size, 4);
                 status = lancer_cmd_read_object(adapter, &read_cmd, chunk_size,
                                                 total_read_len, file_name,
@@ -333,7 +336,6 @@ static int be_get_coalesce(struct net_device *netdev,
         struct be_adapter *adapter = netdev_priv(netdev);
         struct be_aic_obj *aic = &adapter->aic_obj[0];
 
-
         et->rx_coalesce_usecs = aic->prev_eqd;
         et->rx_coalesce_usecs_high = aic->max_eqd;
         et->rx_coalesce_usecs_low = aic->min_eqd;
@@ -534,10 +536,24 @@ static u32 convert_to_et_setting(struct be_adapter *adapter, u32 if_speeds)
                 if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
                         val |= SUPPORTED_10000baseKX4_Full;
                 break;
+        case PHY_TYPE_KR2_20GB:
+                val |= SUPPORTED_Backplane;
+                if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
+                        val |= SUPPORTED_10000baseKR_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_20GBPS)
+                        val |= SUPPORTED_20000baseKR2_Full;
+                break;
         case PHY_TYPE_KR_10GB:
                 val |= SUPPORTED_Backplane |
                                 SUPPORTED_10000baseKR_Full;
                 break;
+        case PHY_TYPE_KR4_40GB:
+                val |= SUPPORTED_Backplane;
+                if (if_speeds & BE_SUPPORTED_SPEED_10GBPS)
+                        val |= SUPPORTED_10000baseKR_Full;
+                if (if_speeds & BE_SUPPORTED_SPEED_40GBPS)
+                        val |= SUPPORTED_40000baseKR4_Full;
+                break;
         case PHY_TYPE_QSFP:
                 if (if_speeds & BE_SUPPORTED_SPEED_40GBPS) {
                         switch (adapter->phy.cable_type) {
@@ -668,8 +684,10 @@ static void be_get_ringparam(struct net_device *netdev,
 {
         struct be_adapter *adapter = netdev_priv(netdev);
 
-        ring->rx_max_pending = ring->rx_pending = adapter->rx_obj[0].q.len;
-        ring->tx_max_pending = ring->tx_pending = adapter->tx_obj[0].q.len;
+        ring->rx_max_pending = adapter->rx_obj[0].q.len;
+        ring->rx_pending = adapter->rx_obj[0].q.len;
+        ring->tx_max_pending = adapter->tx_obj[0].q.len;
+        ring->tx_pending = adapter->tx_obj[0].q.len;
 }
 
 static void
@@ -961,8 +979,6 @@ static void be_set_msg_level(struct net_device *netdev, u32 level)
                                                 FW_LOG_LEVEL_DEFAULT :
                                                 FW_LOG_LEVEL_FATAL);
         adapter->msg_enable = level;
-
-        return;
 }
 
 static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type)
@@ -1181,6 +1197,7 @@ static int be_set_rxfh(struct net_device *netdev, const u32 *indir,
 
         if (indir) {
                 struct be_rx_obj *rxo;
+
                 for (i = 0; i < RSS_INDIR_TABLE_LEN; i++) {
                         j = indir[i];
                         rxo = &adapter->rx_obj[j];
@@ -1196,8 +1213,8 @@ static int be_set_rxfh(struct net_device *netdev, const u32 *indir,
                 hkey =  adapter->rss_info.rss_hkey;
 
         rc = be_cmd_rss_config(adapter, rsstable,
-                        adapter->rss_info.rss_flags,
-                        RSS_INDIR_TABLE_LEN, hkey);
+                               adapter->rss_info.rss_flags,
+                               RSS_INDIR_TABLE_LEN, hkey);
         if (rc) {
                 adapter->rss_info.rss_flags = RSS_ENABLE_NONE;
                 return -EIO;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index beebab60b6c4..9a18e7930b31 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -86,6 +86,7 @@ static const char * const ue_status_low_desc[] = {
         "JTAG ",
         "MPU_INTPEND "
 };
+
 /* UE Status High CSR */
 static const char * const ue_status_hi_desc[] = {
         "LPCMEMHOST",
@@ -122,10 +123,10 @@ static const char * const ue_status_hi_desc[] = {
         "Unknown"
 };
 
-
 static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q)
 {
         struct be_dma_mem *mem = &q->dma_mem;
+
         if (mem->va) {
                 dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
                                   mem->dma);
@@ -187,6 +188,7 @@ static void be_intr_set(struct be_adapter *adapter, bool enable)
 static void be_rxq_notify(struct be_adapter *adapter, u16 qid, u16 posted)
 {
         u32 val = 0;
+
         val |= qid & DB_RQ_RING_ID_MASK;
         val |= posted << DB_RQ_NUM_POSTED_SHIFT;
 
@@ -198,6 +200,7 @@ static void be_txq_notify(struct be_adapter *adapter, struct be_tx_obj *txo,
                           u16 posted)
 {
         u32 val = 0;
+
         val |= txo->q.id & DB_TXULP_RING_ID_MASK;
         val |= (posted & DB_TXULP_NUM_POSTED_MASK) << DB_TXULP_NUM_POSTED_SHIFT;
 
@@ -209,6 +212,7 @@ static void be_eq_notify(struct be_adapter *adapter, u16 qid,
                          bool arm, bool clear_int, u16 num_popped)
 {
         u32 val = 0;
+
         val |= qid & DB_EQ_RING_ID_MASK;
         val |= ((qid & DB_EQ_RING_ID_EXT_MASK) << DB_EQ_RING_ID_EXT_MASK_SHIFT);
 
@@ -227,6 +231,7 @@ static void be_eq_notify(struct be_adapter *adapter, u16 qid,
 void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm, u16 num_popped)
 {
         u32 val = 0;
+
         val |= qid & DB_CQ_RING_ID_MASK;
         val |= ((qid & DB_CQ_RING_ID_EXT_MASK) <<
                         DB_CQ_RING_ID_EXT_MASK_SHIFT);
@@ -488,7 +493,6 @@ static void populate_be_v2_stats(struct be_adapter *adapter)
 
 static void populate_lancer_stats(struct be_adapter *adapter)
 {
-
         struct be_drv_stats *drvs = &adapter->drv_stats;
         struct lancer_pport_stats *pport_stats = pport_stats_from_cmd(adapter);
 
@@ -588,6 +592,7 @@ static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,
 
         for_all_rx_queues(adapter, rxo, i) {
                 const struct be_rx_stats *rx_stats = rx_stats(rxo);
+
                 do {
                         start = u64_stats_fetch_begin_irq(&rx_stats->sync);
                         pkts = rx_stats(rxo)->rx_pkts;
@@ -602,6 +607,7 @@ static struct rtnl_link_stats64 *be_get_stats64(struct net_device *netdev,
 
         for_all_tx_queues(adapter, txo, i) {
                 const struct be_tx_stats *tx_stats = tx_stats(txo);
+
                 do {
                         start = u64_stats_fetch_begin_irq(&tx_stats->sync);
                         pkts = tx_stats(txo)->tx_pkts;
@@ -807,6 +813,7 @@ static int make_tx_wrbs(struct be_adapter *adapter, struct be_queue_info *txq,
 
         if (skb->len > skb->data_len) {
                 int len = skb_headlen(skb);
+
                 busaddr = dma_map_single(dev, skb->data, len, DMA_TO_DEVICE);
                 if (dma_mapping_error(dev, busaddr))
                         goto dma_err;
@@ -820,6 +827,7 @@ static int make_tx_wrbs(struct be_adapter *adapter, struct be_queue_info *txq,
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i];
+
                 busaddr = skb_frag_dma_map(dev, frag, 0,
                                            skb_frag_size(frag), DMA_TO_DEVICE);
                 if (dma_mapping_error(dev, busaddr))
@@ -910,7 +918,7 @@ static bool be_ipv6_exthdr_check(struct sk_buff *skb)
                 if (ip6h->nexthdr != NEXTHDR_TCP &&
                     ip6h->nexthdr != NEXTHDR_UDP) {
                         struct ipv6_opt_hdr *ehdr =
-                                (struct ipv6_opt_hdr *) (skb->data + offset);
+                                (struct ipv6_opt_hdr *)(skb->data + offset);
 
                         /* offending pkt: 2nd byte following IPv6 hdr is 0xff */
                         if (ehdr->hdrlen == 0xff)
@@ -974,8 +982,8 @@ static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter,
          * skip HW tagging is not enabled by FW.
          */
         if (unlikely(be_ipv6_tx_stall_chk(adapter, skb) &&
-            (adapter->pvid || adapter->qnq_vid) &&
-            !qnq_async_evt_rcvd(adapter)))
+                     (adapter->pvid || adapter->qnq_vid) &&
+                     !qnq_async_evt_rcvd(adapter)))
                 goto tx_drop;
 
         /* Manual VLAN tag insertion to prevent:
@@ -1416,6 +1424,7 @@ err:
                 max_tx_rate, vf);
         return be_cmd_status(status);
 }
+
 static int be_set_vf_link_state(struct net_device *netdev, int vf,
                                 int link_state)
 {
@@ -1481,7 +1490,6 @@ static void be_eqd_update(struct be_adapter *adapter)
                         tx_pkts = txo->stats.tx_reqs;
                 } while (u64_stats_fetch_retry_irq(&txo->stats.sync, start));
 
-
                 /* Skip, if wrapped around or first calculation */
                 now = jiffies;
                 if (!aic->jiffies || time_before(now, aic->jiffies) ||
@@ -2053,7 +2061,8 @@ static void be_rx_cq_clean(struct be_rx_obj *rxo)
                 memset(page_info, 0, sizeof(*page_info));
         }
         BUG_ON(atomic_read(&rxq->used));
-        rxq->tail = rxq->head = 0;
+        rxq->tail = 0;
+        rxq->head = 0;
 }
 
 static void be_tx_compl_clean(struct be_adapter *adapter)
@@ -3716,8 +3725,6 @@ static void be_netpoll(struct net_device *netdev)
                 be_eq_notify(eqo->adapter, eqo->q.id, false, true, 0);
                 napi_schedule(&eqo->napi);
         }
-
-        return;
 }
 #endif
 
@@ -4395,7 +4402,6 @@ static void be_add_vxlan_port(struct net_device *netdev, sa_family_t sa_family,
         return;
 err:
         be_disable_vxlan_offloads(adapter);
-        return;
 }
 
 static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family,
@@ -4735,7 +4741,6 @@ static void be_func_recovery_task(struct work_struct *work)
         be_detect_error(adapter);
 
         if (adapter->hw_error && lancer_chip(adapter)) {
-
                 rtnl_lock();
                 netif_device_detach(adapter->netdev);
                 rtnl_unlock();
@@ -4772,7 +4777,7 @@ static void be_worker(struct work_struct *work)
         if (!adapter->stats_cmd_sent) {
                 if (lancer_chip(adapter))
                         lancer_cmd_get_pport_stats(adapter,
-                                                &adapter->stats_cmd);
+                                                   &adapter->stats_cmd);
                 else
                         be_cmd_get_stats(adapter, &adapter->stats_cmd);
         }
@@ -4919,7 +4924,8 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
 
         INIT_DELAYED_WORK(&adapter->work, be_worker);
         INIT_DELAYED_WORK(&adapter->func_recovery_work, be_func_recovery_task);
-        adapter->rx_fc = adapter->tx_fc = true;
+        adapter->rx_fc = true;
+        adapter->tx_fc = true;
 
         status = be_setup(adapter);
         if (status)
diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c
index ef4672dc7357..132866433a25 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.c
+++ b/drivers/net/ethernet/emulex/benet/be_roce.c
@@ -174,6 +174,7 @@ int be_roce_register_driver(struct ocrdma_driver *drv)
         ocrdma_drv = drv;
         list_for_each_entry(dev, &be_adapter_list, entry) {
                 struct net_device *netdev;
+
                 _be_roce_dev_add(dev);
                 netdev = dev->netdev;
                 if (netif_running(netdev) && netif_oper_up(netdev))