Move packet/byte counter to b_net_tx and b_net_rx

Author: Ian Seyler

src/drivers/net/i8254x.asm

@@ -215,7 +215,7 @@ net_i8254x_reset_nextdesc:
 
 
 ; -----------------------------------------------------------------------------
-; net_i8254x_config - 
+; net_i8254x_config -
 ;  IN:	RAX = Base address to store packets
 ;	RDX = Interface ID
 ; OUT:	Nothing
@@ -289,10 +289,6 @@ net_i8254x_transmit:
 	mov rdi, [rdx+nt_base]		; Load the base MMIO of the NIC
 	mov [rdi+i8254x_TDT], eax	; TDL - Transmit Descriptor Tail
 
-	; Increment interface counters
-	inc qword [rdx+nt_tx_packets]
-	add qword [rdx+nt_tx_bytes], rcx
-
 	pop rax
 	pop rdi
 	ret
@@ -348,10 +344,6 @@ net_i8254x_poll:
 	and eax, i8254x_MAX_DESC - 1
 	mov [rsi+i8254x_RDT], eax	; Write the updated Receive Descriptor Tail
 
-	; Increment interface counters
-	inc qword [rdx+nt_rx_packets]
-	add qword [rdx+nt_rx_bytes], rcx
-
 net_i8254x_poll_end:
 	pop rax
 	pop rbx

src/drivers/net/i8257x.asm

@@ -162,7 +162,7 @@ net_i8257x_init_reset_wait:
 	shl eax, 15
 	mov rdi, os_rx_desc
 	add rdi, rax
-net_i8257x_reset_nextdesc:	
+net_i8257x_reset_nextdesc:
 	mov rax, os_PacketBuffers	; Default packet will go here
 	stosq
 	xor eax, eax
@@ -217,7 +217,7 @@ net_i8257x_reset_nextdesc:
 
 
 ; -----------------------------------------------------------------------------
-; net_i8257x_config - 
+; net_i8257x_config -
 ;  IN:	RAX = Base address to store packets
 ;	RDX = Interface ID
 ; OUT:	Nothing
@@ -291,10 +291,6 @@ net_i8257x_transmit:
 	mov rdi, [rdx+nt_base]		; Load the base MMIO of the NIC
 	mov [rdi+i8257x_TDT], eax	; TDL - Transmit Descriptor Tail
 
-	; Increment interface counters
-	inc qword [rdx+nt_tx_packets]
-	add qword [rdx+nt_tx_bytes], rcx
-
 	pop rax
 	pop rdi
 	ret
@@ -350,10 +346,6 @@ net_i8257x_poll:
 	and eax, i8257x_MAX_DESC - 1
 	mov [rsi+i8257x_RDT], eax	; Write the updated Receive Descriptor Tail
 
-	; Increment interface counters
-	inc qword [rdx+nt_rx_packets]
-	add qword [rdx+nt_rx_bytes], rcx
-
 net_i8257x_poll_end:
 	pop rax
 	pop rbx

src/drivers/net/i8259x.asm

@@ -188,7 +188,7 @@ net_i8259x_reset_dma_wait:
 	shl eax, 15
 	mov rdi, os_rx_desc
 	add rdi, rax
-net_i8259x_reset_nextdesc:	
+net_i8259x_reset_nextdesc:
 	mov rax, os_PacketBuffers	; Default packet will go here
 	stosq
 	xor eax, eax
@@ -377,7 +377,7 @@ net_i8259x_init_tx_enable_wait:
 
 
 ; -----------------------------------------------------------------------------
-; net_i8259x_config - 
+; net_i8259x_config -
 ;  IN:	RAX = Base address to store packets
 ;	RDX = Interface ID
 ; OUT:	Nothing
@@ -445,10 +445,6 @@ net_i8259x_transmit:
 
 	; TDESC.STA.DD (bit 32) should be 1 once the hardware has sent the packet
 
-	; Increment interface counters
-	inc qword [rdx+nt_tx_packets]
-	add qword [rdx+nt_tx_bytes], rcx
-
 	pop rax
 	pop rdi
 	ret
@@ -499,10 +495,6 @@ net_i8259x_poll:
 	and eax, i8259x_MAX_DESC - 1
 	mov [rsi+i8259x_RDT], eax	; Write the updated Receive Descriptor Tail
 
-	; Increment interface counters
-	inc qword [rdx+nt_rx_packets]
-	add qword [rdx+nt_rx_bytes], rcx
-
 net_i8259x_poll_end:
 	pop rax
 	pop rbx

src/syscalls/net.asm

@@ -103,6 +103,10 @@ b_net_tx_maxcheck:
 	add rax, nt_lock
 	call b_smp_unlock
 
+	; Increment interface counters
+	inc qword [rdx+nt_tx_packets]
+	add qword [rdx+nt_tx_bytes], rcx
+
 b_net_tx_fail:
 	pop rax
 	pop rcx
@@ -134,6 +138,10 @@ b_net_rx:
 	; Call the driver poll function
 	call [rdx+nt_poll]		; Call driver poll function passing RDX as interface
 
+	; Increment interface counters
+	inc qword [rdx+nt_rx_packets]
+	add qword [rdx+nt_rx_bytes], rcx
+
 b_net_rx_end:
 	pop rdx
 	ret