aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorKalesh AP <kalesh.purayil@emulex.com>2014-09-19 06:17:02 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-22 15:01:09 -0400
commitcd3307aaced34c0d1f5dfd96ee84d012c614e3b7 (patch)
tree88e10b5d3e61e813971ac02e8f6fe6a1eba21869 /drivers/net/ethernet/emulex
parent5f820b6c6e1cd75d5f2d08a684ecb3c2fda22d14 (diff)
be2net: fix alignment on line wrap
This patch fixes alignment whereever it doesn't match the open parenthesis alignment. Signed-off-by: Kalesh AP <kalesh.purayil@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.c9
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c6
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c6
3 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 58e7effc53f9..fead5c65a4f0 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1034,7 +1034,8 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, int pmac_id, u32 dom)
1034 req = embedded_payload(wrb); 1034 req = embedded_payload(wrb);
1035 1035
1036 be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON, 1036 be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
1037 OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req), wrb, NULL); 1037 OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req),
1038 wrb, NULL);
1038 1039
1039 req->hdr.domain = dom; 1040 req->hdr.domain = dom;
1040 req->if_id = cpu_to_le32(if_id); 1041 req->if_id = cpu_to_le32(if_id);
@@ -1709,7 +1710,7 @@ int be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
1709 &get_fat_cmd.dma); 1710 &get_fat_cmd.dma);
1710 if (!get_fat_cmd.va) { 1711 if (!get_fat_cmd.va) {
1711 dev_err(&adapter->pdev->dev, 1712 dev_err(&adapter->pdev->dev,
1712 "Memory allocation failure while retrieving FAT data\n"); 1713 "Memory allocation failure while reading FAT data\n");
1713 return -ENOMEM; 1714 return -ENOMEM;
1714 } 1715 }
1715 1716
@@ -2471,7 +2472,7 @@ err_unlock:
2471} 2472}
2472 2473
2473int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc, 2474int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,
2474 u16 optype, int offset) 2475 u16 optype, int offset)
2475{ 2476{
2476 struct be_mcc_wrb *wrb; 2477 struct be_mcc_wrb *wrb;
2477 struct be_cmd_read_flash_crc *req; 2478 struct be_cmd_read_flash_crc *req;
@@ -2645,7 +2646,7 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
2645 2646
2646 resp = cmd->va; 2647 resp = cmd->va;
2647 if ((memcmp(resp->rcv_buff, req->snd_buff, byte_cnt) != 0) || 2648 if ((memcmp(resp->rcv_buff, req->snd_buff, byte_cnt) != 0) ||
2648 resp->snd_err) { 2649 resp->snd_err) {
2649 status = -1; 2650 status = -1;
2650 } 2651 }
2651 } 2652 }
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 240fb4683955..e42a791c1835 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -277,7 +277,7 @@ static int lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
277 277
278 while ((total_read_len < buf_len) && !eof) { 278 while ((total_read_len < buf_len) && !eof) {
279 chunk_size = min_t(u32, (buf_len - total_read_len), 279 chunk_size = min_t(u32, (buf_len - total_read_len),
280 LANCER_READ_FILE_CHUNK); 280 LANCER_READ_FILE_CHUNK);
281 chunk_size = ALIGN(chunk_size, 4); 281 chunk_size = ALIGN(chunk_size, 4);
282 status = lancer_cmd_read_object(adapter, &read_cmd, chunk_size, 282 status = lancer_cmd_read_object(adapter, &read_cmd, chunk_size,
283 total_read_len, file_name, 283 total_read_len, file_name,
@@ -1213,8 +1213,8 @@ static int be_set_rxfh(struct net_device *netdev, const u32 *indir,
1213 hkey = adapter->rss_info.rss_hkey; 1213 hkey = adapter->rss_info.rss_hkey;
1214 1214
1215 rc = be_cmd_rss_config(adapter, rsstable, 1215 rc = be_cmd_rss_config(adapter, rsstable,
1216 adapter->rss_info.rss_flags, 1216 adapter->rss_info.rss_flags,
1217 RSS_INDIR_TABLE_LEN, hkey); 1217 RSS_INDIR_TABLE_LEN, hkey);
1218 if (rc) { 1218 if (rc) {
1219 adapter->rss_info.rss_flags = RSS_ENABLE_NONE; 1219 adapter->rss_info.rss_flags = RSS_ENABLE_NONE;
1220 return -EIO; 1220 return -EIO;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 78f1de660a29..9a18e7930b31 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -982,8 +982,8 @@ static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter,
982 * skip HW tagging is not enabled by FW. 982 * skip HW tagging is not enabled by FW.
983 */ 983 */
984 if (unlikely(be_ipv6_tx_stall_chk(adapter, skb) && 984 if (unlikely(be_ipv6_tx_stall_chk(adapter, skb) &&
985 (adapter->pvid || adapter->qnq_vid) && 985 (adapter->pvid || adapter->qnq_vid) &&
986 !qnq_async_evt_rcvd(adapter))) 986 !qnq_async_evt_rcvd(adapter)))
987 goto tx_drop; 987 goto tx_drop;
988 988
989 /* Manual VLAN tag insertion to prevent: 989 /* Manual VLAN tag insertion to prevent:
@@ -4777,7 +4777,7 @@ static void be_worker(struct work_struct *work)
4777 if (!adapter->stats_cmd_sent) { 4777 if (!adapter->stats_cmd_sent) {
4778 if (lancer_chip(adapter)) 4778 if (lancer_chip(adapter))
4779 lancer_cmd_get_pport_stats(adapter, 4779 lancer_cmd_get_pport_stats(adapter,
4780 &adapter->stats_cmd); 4780 &adapter->stats_cmd);
4781 else 4781 else
4782 be_cmd_get_stats(adapter, &adapter->stats_cmd); 4782 be_cmd_get_stats(adapter, &adapter->stats_cmd);
4783 } 4783 }