Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f820b6c authored by Kalesh AP's avatar Kalesh AP Committed by David S. Miller
Browse files

be2net: remove multiple assignments on a single line 



This patch removes multiple assignments on a single line as warned
by checkpatch.

Signed-off-by: default avatarKalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 504fbf1e

drivers/net/ethernet/emulex/benet/be_cmds.c

+4 −4
Original line number Diff line number Diff line
@@ -1910,8 +1910,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);
@@ -1922,8 +1922,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

drivers/net/ethernet/emulex/benet/be_ethtool.c

+4 −2
Original line number Diff line number Diff line
@@ -684,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

drivers/net/ethernet/emulex/benet/be_main.c

+4 −2
Original line number Diff line number Diff line
@@ -2061,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)
@@ -4923,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)