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

Commit 186051d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 668e4bc7 e172577d

drivers/net/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1951,7 +1951,7 @@ config SKGE 
	---help---

	---help---

	  This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx

	  This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx

	  and related Gigabit Ethernet adapters. It is a new smaller driver

	  and related Gigabit Ethernet adapters. It is a new smaller driver

	  driver with better performance and more complete ethtool support.

	  with better performance and more complete ethtool support.





	  It does not support the link failover and network management 

	  It does not support the link failover and network management 

	  features that "portable" vendor supplied sk98lin driver does.

	  features that "portable" vendor supplied sk98lin driver does.

drivers/net/e100.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1387,13 +1387,13 @@ static void e100_update_stats(struct nic *nic) 
		ns->collisions += nic->tx_collisions;

		ns->collisions += nic->tx_collisions;

		ns->tx_errors += le32_to_cpu(s->tx_max_collisions) +

		ns->tx_errors += le32_to_cpu(s->tx_max_collisions) +

			le32_to_cpu(s->tx_lost_crs);

			le32_to_cpu(s->tx_lost_crs);

		ns->rx_dropped += le32_to_cpu(s->rx_resource_errors);

		ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors) +

		ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors) +

			nic->rx_over_length_errors;

			nic->rx_over_length_errors;

		ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors);

		ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors);

		ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors);

		ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors);

		ns->rx_over_errors += le32_to_cpu(s->rx_overrun_errors);

		ns->rx_over_errors += le32_to_cpu(s->rx_overrun_errors);

		ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors);

		ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors);

		ns->rx_missed_errors += le32_to_cpu(s->rx_resource_errors);

		ns->rx_errors += le32_to_cpu(s->rx_crc_errors) +

		ns->rx_errors += le32_to_cpu(s->rx_crc_errors) +

			le32_to_cpu(s->rx_alignment_errors) +

			le32_to_cpu(s->rx_alignment_errors) +

			le32_to_cpu(s->rx_short_frame_errors) +

			le32_to_cpu(s->rx_short_frame_errors) +
@@ -1727,12 +1727,10 @@ static inline int e100_rx_indicate(struct nic *nic, struct rx *rx, 




	if(unlikely(!(rfd_status & cb_ok))) {

	if(unlikely(!(rfd_status & cb_ok))) {

		/* Don't indicate if hardware indicates errors */

		/* Don't indicate if hardware indicates errors */

		nic->net_stats.rx_dropped++;

		dev_kfree_skb_any(skb);

		dev_kfree_skb_any(skb);

	} else if(actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) {

	} else if(actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) {

		/* Don't indicate oversized frames */

		/* Don't indicate oversized frames */

		nic->rx_over_length_errors++;

		nic->rx_over_length_errors++;

		nic->net_stats.rx_dropped++;

		dev_kfree_skb_any(skb);

		dev_kfree_skb_any(skb);

	} else {

	} else {

		nic->net_stats.rx_packets++;

		nic->net_stats.rx_packets++;

drivers/net/e1000/e1000_main.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2544,7 +2544,6 @@ e1000_update_stats(struct e1000_adapter *adapter) 
		adapter->stats.crcerrs + adapter->stats.algnerrc +

		adapter->stats.crcerrs + adapter->stats.algnerrc +

		adapter->stats.rlec + adapter->stats.mpc + 

		adapter->stats.rlec + adapter->stats.mpc + 

		adapter->stats.cexterr;

		adapter->stats.cexterr;

	adapter->net_stats.rx_dropped = adapter->stats.mpc;

	adapter->net_stats.rx_length_errors = adapter->stats.rlec;

	adapter->net_stats.rx_length_errors = adapter->stats.rlec;

	adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;

	adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;

	adapter->net_stats.rx_frame_errors = adapter->stats.algnerrc;

	adapter->net_stats.rx_frame_errors = adapter->stats.algnerrc;

drivers/net/ixgb/ixgb_main.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1616,8 +1616,6 @@ ixgb_update_stats(struct ixgb_adapter *adapter) 
	    adapter->stats.icbc +

	    adapter->stats.icbc +

	    adapter->stats.ecbc + adapter->stats.mpc;

	    adapter->stats.ecbc + adapter->stats.mpc;





	adapter->net_stats.rx_dropped = adapter->stats.mpc;



	/* see above

	/* see above

	 * adapter->net_stats.rx_length_errors = adapter->stats.rlec;

	 * adapter->net_stats.rx_length_errors = adapter->stats.rlec;

	 */

	 */

drivers/net/s2io.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -428,7 +428,7 @@ static int init_shared_mem(struct s2io_nic *nic) 
				DBG_PRINT(INIT_DBG, 

				DBG_PRINT(INIT_DBG, 

				"%s: Zero DMA address for TxDL. ", dev->name);

				"%s: Zero DMA address for TxDL. ", dev->name);

				DBG_PRINT(INIT_DBG, 

				DBG_PRINT(INIT_DBG, 

				"Virtual address %llx\n", (u64)tmp_v);

				"Virtual address %p\n", tmp_v);

				tmp_v = pci_alloc_consistent(nic->pdev,

				tmp_v = pci_alloc_consistent(nic->pdev,

						     PAGE_SIZE, &tmp_p);

						     PAGE_SIZE, &tmp_p);

				if (!tmp_v) {

				if (!tmp_v) {
@@ -657,9 +657,10 @@ static void free_shared_mem(struct s2io_nic *nic) 
					    mac_control->zerodma_virt_addr,

					    mac_control->zerodma_virt_addr,

					    (dma_addr_t)0);

					    (dma_addr_t)0);

			DBG_PRINT(INIT_DBG, 

			DBG_PRINT(INIT_DBG, 

			"%s: Freeing TxDL with zero DMA addr. ", dev->name);

			  	"%s: Freeing TxDL with zero DMA addr. ",

			DBG_PRINT(INIT_DBG, "Virtual address %llx\n",

				dev->name);

			(u64)(mac_control->zerodma_virt_addr));

			DBG_PRINT(INIT_DBG, "Virtual address %p\n",

				mac_control->zerodma_virt_addr);

		}

		}

		kfree(mac_control->fifos[i].list_info);

		kfree(mac_control->fifos[i].list_info);

	}

	}