staging: et131x: Remove some unecessary packet accounting code (13425aa1) · Commits · 戴 / test

drivers/staging/et131x/et1310_rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1131,7 +1131,7 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
		continue;

		/* Increment the number of packets we received */
		etdev->stats.ipackets++;
		etdev->net_stats.rx_packets++;

		/* Set the status on the packet, either resources or success */
		if (etdev->rx_ring.nReadyRecv < RFD_LOW_WATER_MARK) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -673,7 +673,7 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev,
		/* Add the TCB to the Ready Q */
		spin_lock_irqsave(&etdev->TCBReadyQLock, flags);

		etdev->stats.opackets++;
		etdev->net_stats.tx_packets++;

		if (etdev->tx_ring.tcb_qtail)
		etdev->tx_ring.tcb_qtail->next = tcb;

+0 −5

Original line number	Diff line number	Diff line
		@@ -99,10 +99,6 @@ struct rfd {

		/* Struct to define some device statistics */
		struct ce_stats {
		/* Link Input/Output stats */
		uint64_t ipackets; /* # of in packets */
		uint64_t opackets; /* # of out packets */

		/* MIB II variables
		*
		* NOTE: atomic_t types are only guaranteed to store 24-bits; if we
		@@ -242,7 +238,6 @@ struct et131x_adapter {
		struct ce_stats stats;

		struct net_device_stats net_stats;
		struct net_device_stats net_stats_prev;
		};

		#endif /* __ET131X_ADAPTER_H__ */

+1 −5

Original line number	Diff line number	Diff line
		@@ -88,22 +88,18 @@
		#include "et131x_adapter.h"
		#include "et131x.h"

		struct net_device_stats et131x_stats(struct net_device netdev);

		/**
		* et131x_stats - Return the current device statistics.
		* @netdev: device whose stats are being queried
		*
		* Returns 0 on success, errno on failure (as defined in errno.h)
		*/
		struct net_device_stats et131x_stats(struct net_device netdev)
		static struct net_device_stats et131x_stats(struct net_device netdev)
		{
		struct et131x_adapter *adapter = netdev_priv(netdev);
		struct net_device_stats *stats = &adapter->net_stats;
		struct ce_stats *devstat = &adapter->stats;

		stats->rx_packets = devstat->ipackets;
		stats->tx_packets = devstat->opackets;
		stats->rx_errors = devstat->length_err + devstat->alignment_err +
		devstat->crc_err + devstat->code_violations + devstat->other_errors;
		stats->tx_errors = devstat->max_pkt_error;