[PATCH] e1000: Fix whitespace (96838a40) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/e1000/e1000_ethtool.c

+153 −154

Original line number	Diff line number	Diff line
		@@ -280,8 +280,7 @@ e1000_set_pauseparam(struct net_device *netdev,
		e1000_up(adapter);
		} else
		e1000_reset(adapter);
		}
		else
		} else
		return ((hw->media_type == e1000_media_type_fiber) ?
		e1000_setup_link(hw) : e1000_force_mac_fc(hw));

drivers/net/e1000/e1000_hw.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -4504,6 +4504,7 @@ e1000_read_mac_addr(struct e1000_hw * hw)
		hw->perm_mac_addr[i] = (uint8_t) (eeprom_data & 0x00FF);
		hw->perm_mac_addr[i+1] = (uint8_t) (eeprom_data >> 8);
		}

		switch (hw->mac_type) {
		default:
		break;
		@@ -6840,6 +6841,7 @@ int32_t
		e1000_check_phy_reset_block(struct e1000_hw *hw)
		{
		uint32_t manc = 0;

		if (hw->mac_type > e1000_82547_rev_2)
		manc = E1000_READ_REG(hw, MANC);
		return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?

drivers/net/e1000/e1000_hw.h

+8 −9

Original line number	Diff line number	Diff line
		@@ -1764,7 +1764,6 @@ struct e1000_hw {
		#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
		#define E1000_TXDCTL_COUNT_DESC 0x00400000 /* Enable the counting of desc.
		still to be processed. */

		/* Transmit Configuration Word */
		#define E1000_TXCW_FD 0x00000020 /* TXCW full duplex */
		#define E1000_TXCW_HD 0x00000040 /* TXCW half duplex */

drivers/net/e1000/e1000_main.c

+249 −247

Original line number	Diff line number	Diff line
		@@ -1298,8 +1298,8 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
		"at %p\n", txdr->size, txdr->desc);
		/* Try again, without freeing the previous */
		txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
		if(!txdr->desc) {
		/* Failed allocation, critical failure */
		if (!txdr->desc) {
		pci_free_consistent(pdev, txdr->size, olddesc, olddma);
		goto setup_tx_desc_die;
		}
		@@ -2023,7 +2023,6 @@ e1000_clean_rx_ring(struct e1000_adapter *adapter,
		unsigned int i, j;

		/* Free all the Rx ring sk_buffs */

		for (i = 0; i < rx_ring->count; i++) {
		buffer_info = &rx_ring->buffer_info[i];
		if (buffer_info->skb) {
		@@ -2861,8 +2860,8 @@ e1000_xmit_frame(struct sk_buff skb, struct net_device netdev)
		}
		}

		if((mss) \|\| (skb->ip_summed == CHECKSUM_HW))
		/* reserve a descriptor for the offload context */
		if ((mss) \|\| (skb->ip_summed == CHECKSUM_HW))
		count++;
		count++;
		#else
		@@ -3311,14 +3310,14 @@ e1000_intr(int irq, void data, struct pt_regs regs)

		#else /* if !CONFIG_E1000_NAPI */
		/* Writing IMC and IMS is needed for 82547.
		Due to Hub Link bus being occupied, an interrupt
		de-assertion message is not able to be sent.
		When an interrupt assertion message is generated later,
		two messages are re-ordered and sent out.
		That causes APIC to think 82547 is in de-assertion
		state, while 82547 is in assertion state, resulting
		in dead lock. Writing IMC forces 82547 into
		de-assertion state.
		* Due to Hub Link bus being occupied, an interrupt
		* de-assertion message is not able to be sent.
		* When an interrupt assertion message is generated later,
		* two messages are re-ordered and sent out.
		* That causes APIC to think 82547 is in de-assertion
		* state, while 82547 is in assertion state, resulting
		* in dead lock. Writing IMC forces 82547 into
		* de-assertion state.
		*/
		if (hw->mac_type == e1000_82547 \|\| hw->mac_type == e1000_82547_rev_2) {
		atomic_inc(&adapter->irq_sem);
		@@ -3672,6 +3671,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
		(uint32_t)(status) \|
		((uint32_t)(rx_desc->errors) << 24),
		rx_desc->csum, skb);

		skb->protocol = eth_type_trans(skb, netdev);
		#ifdef CONFIG_E1000_NAPI
		if (unlikely(adapter->vlgrp &&
		@@ -3952,7 +3952,8 @@ e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
		rx_desc = E1000_RX_DESC(*rx_ring, i);
		rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);

		if(unlikely(++i == rx_ring->count)) i = 0;
		if (unlikely(++i == rx_ring->count))
		i = 0;
		buffer_info = &rx_ring->buffer_info[i];
		}

		@@ -4345,6 +4346,7 @@ e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid)
		{
		struct e1000_adapter *adapter = netdev_priv(netdev);
		uint32_t vfta, index;

		if ((adapter->hw.mng_cookie.status &
		E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
		(vid == adapter->mng_vlan_id))

drivers/net/e1000/e1000_osdep.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/net/e1000/e1000_param.c

+22 −22

File changed.

Contains only whitespace changes.