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

Commit 33550cec authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup unusually placed comments 



Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fc830b78

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+1 −1
Original line number Diff line number Diff line
@@ -753,9 +753,9 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) 


	/* Initialize identification LED */

	ret_val = mac->ops.id_led_init(hw);

	/* An error is not fatal and we should not stop init due to this */

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */



	/* Disabling VLAN filtering */

	e_dbg("Initializing the IEEE VLAN\n");

drivers/net/ethernet/intel/e1000e/82571.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,9 +1096,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) 


	/* Initialize identification LED */

	ret_val = mac->ops.id_led_init(hw);

	/* An error is not fatal and we should not stop init due to this */

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */



	/* Disabling VLAN filtering */

	e_dbg("Initializing the IEEE VLAN\n");

drivers/net/ethernet/intel/e1000e/e1000.h

+2 −3
Original line number Diff line number Diff line
@@ -238,9 +238,8 @@ struct e1000_adapter { 
	u16 tx_itr;

	u16 rx_itr;



	/* Tx */

	struct e1000_ring *tx_ring /* One per active queue */

						____cacheline_aligned_in_smp;

	/* Tx - one ring per active queue */

	struct e1000_ring *tx_ring ____cacheline_aligned_in_smp;

	u32 tx_fifo_limit;



	struct napi_struct napi;

drivers/net/ethernet/intel/e1000e/ethtool.c

+9 −6
Original line number Diff line number Diff line
@@ -812,10 +812,10 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	u32 wlock_mac = 0;



	/* The status register is Read Only, so a write should fail.

	 * Some bits that get toggled are ignored.

	 * Some bits that get toggled are ignored.  There are several bits

	 * on newer hardware that are r/w.

	 */

	switch (mac->type) {

	/* there are several bits on newer hardware that are r/w */

	case e1000_82571:

	case e1000_82572:

	case e1000_80003es2lan:
@@ -1600,8 +1600,10 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) 


	k = 0;

	l = 0;

	for (j = 0; j <= lc; j++) { /* loop count loop */

		for (i = 0; i < 64; i++) { /* send the packets */

	/* loop count loop */

	for (j = 0; j <= lc; j++) {

		/* send the packets */

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

			buffer_info = &tx_ring->buffer_info[k];



			e1000_create_lbtest_frame(buffer_info->skb, 1024);
@@ -1618,7 +1620,8 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) 
		msleep(200);

		time = jiffies; /* set the start time for the receive */

		good_cnt = 0;

		do { /* receive the sent packets */

		/* receive the sent packets */

		do {

			buffer_info = &rx_ring->buffer_info[l];



			dma_sync_single_for_cpu(&pdev->dev,
@@ -1645,7 +1648,7 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) 
			ret_val = 14; /* error code for time out error */

			break;

		}

	} /* end loop count loop */

	}

	return ret_val;

}

drivers/net/ethernet/intel/e1000e/ich8lan.c

+1 −1
Original line number Diff line number Diff line
@@ -3452,9 +3452,9 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) 


	/* Initialize identification LED */

	ret_val = mac->ops.id_led_init(hw);

	/* An error is not fatal and we should not stop init due to this */

	if (ret_val)

		e_dbg("Error initializing identification LED\n");

		/* This is not fatal and we should not stop init due to this */



	/* Setup the receive address. */

	e1000e_init_rx_addrs(hw, mac->rar_entry_count);