From 0bcc732c026c83eb0241eba96d097a0d6af05572 Mon Sep 17 00:00:00 2001 From: Ilias Apalodimas Date: Fri, 13 Oct 2017 10:35:06 +0300 Subject: Removed some more CamelCase variables Signed-off-by: Ilias Apalodimas --- drivers/r8169.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/r8169.c') diff --git a/drivers/r8169.c b/drivers/r8169.c index 390a8f5..1a563ab 100644 --- a/drivers/r8169.c +++ b/drivers/r8169.c @@ -48,13 +48,13 @@ static int rtl8169_rx_fill(int device, void *rx_data, struct iomem data, char *rx_buff[]) { int i; - struct RxDesc *rxRing = (struct RxDesc *) rx_data; + struct RxDesc *r8169_rxring = (struct RxDesc *) rx_data; for (i = 0; i < NUM_RX_DESC; i++) { - rtl8169_map_to_asic(&rxRing[i], data.iova + i * 2048, 2048); + rtl8169_map_to_asic(&r8169_rxring[i], data.iova + i * 2048, 2048); rx_buff[i] = (char *)(data.vaddr + i * 2048); } - rtl8169_mark_as_last_descriptor(&rxRing[NUM_RX_DESC - 1]); + rtl8169_mark_as_last_descriptor(&r8169_rxring[NUM_RX_DESC - 1]); return 0; } @@ -62,7 +62,7 @@ static int rtl8169_rx_fill(int device, void *rx_data, struct iomem data, void r8169_recv(void *rxring, char *rx_buff[]) { int i = 0; - struct RxDesc *rxRing = (struct RxDesc *)rxring; + struct RxDesc *r8169_rxring = (struct RxDesc *)rxring; while (1) { if (i >= NUM_RX_DESC) @@ -70,7 +70,7 @@ void r8169_recv(void *rxring, char *rx_buff[]) for (; i < NUM_RX_DESC; i++) { __u32 status; - status = le32_to_cpu(rxRing[i].opts1) & ~0; /// either ~(RxBOVF | RxFOVF) or ~0; + status = le32_to_cpu(r8169_rxring[i].opts1) & ~0; /// either ~(RxBOVF | RxFOVF) or ~0; if (status & DescOwn) { usleep(100*1000); @@ -104,7 +104,7 @@ void r8169_recv(void *rxring, char *rx_buff[]) //dma_addr_t addr; int pkt_size; process_pkt: - //addr = le64_to_cpu(rxRing[i].addr); + //addr = le64_to_cpu(r8169_rxring[i].addr); if (1) // likely(!(dev->features & NETIF_F_RXFCS))) pkt_size = (status & 0x00003fff) - 4; else @@ -150,8 +150,8 @@ process_pkt: printf("\n"); } /* release_descriptor: */ - rxRing[i].opts2 = 0; - rtl8169_mark_to_asic(&rxRing[i], 2048); + r8169_rxring[i].opts2 = 0; + rtl8169_mark_to_asic(&r8169_rxring[i], 2048); } } } -- cgit v1.2.3