Commit 8e51a637 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-repeated-words' 



Huazhong Tan says:

====================
net: remove repeated words

This patch-set removes some repeated words in comments.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cf5b15ab 497abc87

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1, 
 * If @slave's permanent hw address is different both from its current

 * address and from @bond's address, then somewhere in the bond there's

 * a slave that has @slave's permanet address as its current address.

 * We'll make sure that that slave no longer uses @slave's permanent address.

 * We'll make sure that slave no longer uses @slave's permanent address.

 *

 * Caller must hold RTNL and no other locks

 */

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −2
Original line number Diff line number Diff line
@@ -7339,7 +7339,7 @@ static void i40e_vsi_set_default_tc_config(struct i40e_vsi *vsi) 
	qcount = min_t(int, vsi->alloc_queue_pairs,

		       i40e_pf_get_max_q_per_tc(vsi->back));

	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

		/* For the TC that is not enabled set the offset to to default

		/* For the TC that is not enabled set the offset to default

		 * queue and allocate one queue for the given TC.

		 */

		vsi->tc_config.tc_info[i].qoffset = 0;
@@ -10625,7 +10625,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) 
	 * need to rebuild the switch model in the HW.

	 *

	 * If there were VEBs but the reconstitution failed, we'll try

	 * try to recover minimal use by getting the basic PF VSI working.

	 * to recover minimal use by getting the basic PF VSI working.

	 */

	if (vsi->uplink_seid != pf->mac_seid) {

		dev_dbg(&pf->pdev->dev, "attempting to rebuild switch\n");

drivers/net/ipa/ipa_endpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static u32 hol_block_timer_val(struct ipa *ipa, u32 microseconds) 
	 * The best precision is achieved when the base value is as

	 * large as possible.  Find the highest set bit in the tick

	 * count, and extract the number of bits in the base field

	 * such that that high bit is included.

	 * such that high bit is included.

	 */

	high = fls(ticks);		/* 1..32 */

	width = HWEIGHT32(BASE_VALUE_FMASK);
@@ -1448,7 +1448,7 @@ static int ipa_endpoint_reset_rx_aggr(struct ipa_endpoint *endpoint) 
	if (ret)

		goto out_suspend_again;



	/* Finally, reset and reconfigure the channel again (re-enabling the

	/* Finally, reset and reconfigure the channel again (re-enabling

	 * the doorbell engine if appropriate).  Sleep for 1 millisecond to

	 * complete the channel reset sequence.  Finish by suspending the

	 * channel again (if necessary).

drivers/net/phy/mdio_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int mdiobus_create_device(struct mii_bus *bus, 
 *   on a given bus, and attach them to the bus. Drivers should use

 *   mdiobus_register() rather than __mdiobus_register() unless they

 *   need to pass a specific owner module. MDIO devices which are not

 *   PHYs will not be brought up by this function. They are expected to

 *   PHYs will not be brought up by this function. They are expected

 *   to be explicitly listed in DT and instantiated by of_mdiobus_register().

 *

 * Returns 0 on success or < 0 on error.