diff options
author | Kalesh AP <kalesh.purayil@emulex.com> | 2014-09-19 06:17:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-22 15:01:09 -0400 |
commit | 5f820b6c6e1cd75d5f2d08a684ecb3c2fda22d14 (patch) | |
tree | 44cc39954e325bc97b8ae1061131f60568ee0eac | |
parent | 504fbf1e4f1a0f9c1586dfa22ef0eb20521f9df3 (diff) |
be2net: remove multiple assignments on a single line
This patch removes multiple assignments on a single line as warned
by checkpatch.
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>
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_cmds.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 48f4be3d14b9..58e7effc53f9 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
@@ -1910,8 +1910,8 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value) | |||
1910 | BE_IF_FLAGS_VLAN_PROMISCUOUS | | 1910 | BE_IF_FLAGS_VLAN_PROMISCUOUS | |
1911 | BE_IF_FLAGS_MCAST_PROMISCUOUS); | 1911 | BE_IF_FLAGS_MCAST_PROMISCUOUS); |
1912 | } else if (flags & IFF_ALLMULTI) { | 1912 | } else if (flags & IFF_ALLMULTI) { |
1913 | req->if_flags_mask = req->if_flags = | 1913 | req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS); |
1914 | cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS); | 1914 | req->if_flags = cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS); |
1915 | } else if (flags & BE_FLAGS_VLAN_PROMISC) { | 1915 | } else if (flags & BE_FLAGS_VLAN_PROMISC) { |
1916 | req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_VLAN_PROMISCUOUS); | 1916 | req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_VLAN_PROMISCUOUS); |
1917 | 1917 | ||
@@ -1922,8 +1922,8 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value) | |||
1922 | struct netdev_hw_addr *ha; | 1922 | struct netdev_hw_addr *ha; |
1923 | int i = 0; | 1923 | int i = 0; |
1924 | 1924 | ||
1925 | req->if_flags_mask = req->if_flags = | 1925 | req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_MULTICAST); |
1926 | cpu_to_le32(BE_IF_FLAGS_MULTICAST); | 1926 | req->if_flags = cpu_to_le32(BE_IF_FLAGS_MULTICAST); |
1927 | 1927 | ||
1928 | /* Reset mcast promisc mode if already set by setting mask | 1928 | /* Reset mcast promisc mode if already set by setting mask |
1929 | * and not setting flags field | 1929 | * and not setting flags field |
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index 42b10f973793..240fb4683955 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c | |||
@@ -684,8 +684,10 @@ static void be_get_ringparam(struct net_device *netdev, | |||
684 | { | 684 | { |
685 | struct be_adapter *adapter = netdev_priv(netdev); | 685 | struct be_adapter *adapter = netdev_priv(netdev); |
686 | 686 | ||
687 | ring->rx_max_pending = ring->rx_pending = adapter->rx_obj[0].q.len; | 687 | ring->rx_max_pending = adapter->rx_obj[0].q.len; |
688 | ring->tx_max_pending = ring->tx_pending = adapter->tx_obj[0].q.len; | 688 | ring->rx_pending = adapter->rx_obj[0].q.len; |
689 | ring->tx_max_pending = adapter->tx_obj[0].q.len; | ||
690 | ring->tx_pending = adapter->tx_obj[0].q.len; | ||
689 | } | 691 | } |
690 | 692 | ||
691 | static void | 693 | static void |
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 0bed42bd1833..78f1de660a29 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
@@ -2061,7 +2061,8 @@ static void be_rx_cq_clean(struct be_rx_obj *rxo) | |||
2061 | memset(page_info, 0, sizeof(*page_info)); | 2061 | memset(page_info, 0, sizeof(*page_info)); |
2062 | } | 2062 | } |
2063 | BUG_ON(atomic_read(&rxq->used)); | 2063 | BUG_ON(atomic_read(&rxq->used)); |
2064 | rxq->tail = rxq->head = 0; | 2064 | rxq->tail = 0; |
2065 | rxq->head = 0; | ||
2065 | } | 2066 | } |
2066 | 2067 | ||
2067 | static void be_tx_compl_clean(struct be_adapter *adapter) | 2068 | static void be_tx_compl_clean(struct be_adapter *adapter) |
@@ -4923,7 +4924,8 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id) | |||
4923 | 4924 | ||
4924 | INIT_DELAYED_WORK(&adapter->work, be_worker); | 4925 | INIT_DELAYED_WORK(&adapter->work, be_worker); |
4925 | INIT_DELAYED_WORK(&adapter->func_recovery_work, be_func_recovery_task); | 4926 | INIT_DELAYED_WORK(&adapter->func_recovery_work, be_func_recovery_task); |
4926 | adapter->rx_fc = adapter->tx_fc = true; | 4927 | adapter->rx_fc = true; |
4928 | adapter->tx_fc = true; | ||
4927 | 4929 | ||
4928 | status = be_setup(adapter); | 4930 | status = be_setup(adapter); |
4929 | if (status) | 4931 | if (status) |