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

Commit f4b70529 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

staging: et131x: Removing '_t' from ce_stats_t struct 



Removing '_t' from ce_stats_t struct name and renaming et131x_adapter ce_stats member from
 'Stats' to 'stats'

Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 57ecdfa7

drivers/staging/et131x/et1310_mac.c

+15 −15
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ void ConfigFlowControl(struct et131x_adapter *etdev) 
 */

void UpdateMacStatHostCounters(struct et131x_adapter *etdev)

{

	struct ce_stats_t *stats = &etdev->Stats;

	struct ce_stats *stats = &etdev->stats;

	struct macstat_regs __iomem *macstat =

		&etdev->regs->macstat;
@@ -503,33 +503,33 @@ void HandleMacStatInterrupt(struct et131x_adapter *etdev) 
	 * block indicates that one of the counters has wrapped.

	 */

	if (Carry1 & (1 << 14))

		etdev->Stats.code_violations += COUNTER_WRAP_16_BIT;

		etdev->stats.code_violations += COUNTER_WRAP_16_BIT;

	if (Carry1 & (1 << 8))

		etdev->Stats.alignment_err += COUNTER_WRAP_12_BIT;

		etdev->stats.alignment_err += COUNTER_WRAP_12_BIT;

	if (Carry1 & (1 << 7))

		etdev->Stats.length_err += COUNTER_WRAP_16_BIT;

		etdev->stats.length_err += COUNTER_WRAP_16_BIT;

	if (Carry1 & (1 << 2))

		etdev->Stats.other_errors += COUNTER_WRAP_16_BIT;

		etdev->stats.other_errors += COUNTER_WRAP_16_BIT;

	if (Carry1 & (1 << 6))

		etdev->Stats.crc_err += COUNTER_WRAP_16_BIT;

		etdev->stats.crc_err += COUNTER_WRAP_16_BIT;

	if (Carry1 & (1 << 3))

		etdev->Stats.rx_ov_flow += COUNTER_WRAP_16_BIT;

		etdev->stats.rx_ov_flow += COUNTER_WRAP_16_BIT;

	if (Carry1 & (1 << 0))

		etdev->Stats.norcvbuf += COUNTER_WRAP_16_BIT;

		etdev->stats.norcvbuf += COUNTER_WRAP_16_BIT;

	if (Carry2 & (1 << 16))

		etdev->Stats.max_pkt_error += COUNTER_WRAP_12_BIT;

		etdev->stats.max_pkt_error += COUNTER_WRAP_12_BIT;

	if (Carry2 & (1 << 15))

		etdev->Stats.tx_uflo += COUNTER_WRAP_12_BIT;

		etdev->stats.tx_uflo += COUNTER_WRAP_12_BIT;

	if (Carry2 & (1 << 6))

		etdev->Stats.first_collision += COUNTER_WRAP_12_BIT;

		etdev->stats.first_collision += COUNTER_WRAP_12_BIT;

	if (Carry2 & (1 << 8))

		etdev->Stats.tx_deferred += COUNTER_WRAP_12_BIT;

		etdev->stats.tx_deferred += COUNTER_WRAP_12_BIT;

	if (Carry2 & (1 << 5))

		etdev->Stats.excessive_collisions += COUNTER_WRAP_12_BIT;

		etdev->stats.excessive_collisions += COUNTER_WRAP_12_BIT;

	if (Carry2 & (1 << 4))

		etdev->Stats.late_collisions += COUNTER_WRAP_12_BIT;

		etdev->stats.late_collisions += COUNTER_WRAP_12_BIT;

	if (Carry2 & (1 << 2))

		etdev->Stats.collisions += COUNTER_WRAP_12_BIT;

		etdev->stats.collisions += COUNTER_WRAP_12_BIT;

}



void SetupDeviceForMulticast(struct et131x_adapter *etdev)

drivers/staging/et131x/et1310_phy.c

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int MiWrite(struct et131x_adapter *etdev, u8 xcvrReg, u16 value) 
{

	struct mac_regs __iomem *mac = &etdev->regs->mac;

	int status = 0;

	u8 xcvrAddr = etdev->Stats.xcvr_addr;

	u8 xcvrAddr = etdev->stats.xcvr_addr;

	u32 delay;

	u32 miiAddr;

	u32 miiCmd;
@@ -259,8 +259,8 @@ int et131x_xcvr_find(struct et131x_adapter *etdev) 
		xcvr_id = (u32) ((idr1 << 16) | idr2);



		if (idr1 != 0 && idr1 != 0xffff) {

			etdev->Stats.xcvr_id = xcvr_id;

			etdev->Stats.xcvr_addr = xcvr_addr;

			etdev->stats.xcvr_id = xcvr_id;

			etdev->stats.xcvr_addr = xcvr_addr;

			return 0;

		}

	}

drivers/staging/et131x/et1310_rx.c

+5 −5
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ struct rfd *nic_rx_pkts(struct et131x_adapter *etdev) 
	 * also counted here.

	 */

	if (len < (NIC_MIN_PACKET_SIZE + 4)) {

		etdev->Stats.other_errors++;

		etdev->stats.other_errors++;

		len = 0;

	}
@@ -1039,16 +1039,16 @@ struct rfd *nic_rx_pkts(struct et131x_adapter *etdev) 
			}



			if (len > 0)

				etdev->Stats.multircv++;

				etdev->stats.multircv++;

		} else if (word0 & ALCATEL_BROADCAST_PKT)

			etdev->Stats.brdcstrcv++;

			etdev->stats.brdcstrcv++;

		else

			/* Not sure what this counter measures in

			 * promiscuous mode. Perhaps we should check

			 * the MAC address to see if it is directed

			 * to us in promiscuous mode.

			 */

			etdev->Stats.unircv++;

			etdev->stats.unircv++;

	}



	if (len > 0) {
@@ -1132,7 +1132,7 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) 
		}



		/* Increment the number of packets we received */

		etdev->Stats.ipackets++;

		etdev->stats.ipackets++;



		/* Set the status on the packet, either resources or success */

		if (etdev->rx_ring.nReadyRecv < RFD_LOW_WATER_MARK) {

drivers/staging/et131x/et1310_tx.c

+4 −4
Original line number Diff line number Diff line
@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev, 
	struct net_device_stats *stats = &etdev->net_stats;



	if (tcb->flags & fMP_DEST_BROAD)

		atomic_inc(&etdev->Stats.brdcstxmt);

		atomic_inc(&etdev->stats.brdcstxmt);

	else if (tcb->flags & fMP_DEST_MULTI)

		atomic_inc(&etdev->Stats.multixmt);

		atomic_inc(&etdev->stats.multixmt);

	else

		atomic_inc(&etdev->Stats.unixmt);

		atomic_inc(&etdev->stats.unixmt);



	if (tcb->skb) {

		stats->tx_bytes += tcb->skb->len;
@@ -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->stats.opackets++;



	if (etdev->tx_ring.tcb_qtail)

		etdev->tx_ring.tcb_qtail->next = tcb;

drivers/staging/et131x/et131x.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void et131x_setphy_normal(struct et131x_adapter *adapter); 
int PhyMiRead(struct et131x_adapter *adapter, u8 xcvrAddr,

	      u8 xcvrReg, u16 *value);

#define MiRead(adapter, xcvrReg, value) \

	PhyMiRead((adapter), (adapter)->Stats.xcvr_addr, (xcvrReg), (value))

	PhyMiRead((adapter), (adapter)->stats.xcvr_addr, (xcvrReg), (value))



int32_t MiWrite(struct et131x_adapter *adapter,

		u8 xcvReg, u16 value);