Date: Mon, 28 Jun 2010 14:06:45 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r209574 - stable/7/sys/dev/e1000 Message-ID: <201006281406.o5SE6jbN024992@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Mon Jun 28 14:06:44 2010 New Revision: 209574 URL: http://svn.freebsd.org/changeset/base/209574 Log: Remove gratuitous whitespace changes accidentally added in the previous commit. Modified: stable/7/sys/dev/e1000/e1000_regs.h stable/7/sys/dev/e1000/if_em.c Modified: stable/7/sys/dev/e1000/e1000_regs.h ============================================================================== --- stable/7/sys/dev/e1000/e1000_regs.h Mon Jun 28 14:04:19 2010 (r209573) +++ stable/7/sys/dev/e1000/e1000_regs.h Mon Jun 28 14:06:44 2010 (r209574) @@ -236,7 +236,7 @@ #define E1000_PRC64 0x0405C /* Packets Rx (64 bytes) - R/clr */ #define E1000_PRC127 0x04060 /* Packets Rx (65-127 bytes) - R/clr */ #define E1000_PRC255 0x04064 /* Packets Rx (128-255 bytes) - R/clr */ -#define E1000_PRC511 0x04068 /* Packets Rx (256-511 bytes) - R/clr */ +#define E1000_PRC511 0x04068 /* Packets Rx (255-511 bytes) - R/clr */ #define E1000_PRC1023 0x0406C /* Packets Rx (512-1023 bytes) - R/clr */ #define E1000_PRC1522 0x04070 /* Packets Rx (1024-1522 bytes) - R/clr */ #define E1000_GPRC 0x04074 /* Good Packets Rx Count - R/clr */ Modified: stable/7/sys/dev/e1000/if_em.c ============================================================================== --- stable/7/sys/dev/e1000/if_em.c Mon Jun 28 14:04:19 2010 (r209573) +++ stable/7/sys/dev/e1000/if_em.c Mon Jun 28 14:06:44 2010 (r209574) @@ -2057,8 +2057,8 @@ static void em_local_timer(void *arg) { struct adapter *adapter = arg; + struct ifnet *ifp = adapter->ifp; struct tx_ring *txr = adapter->tx_rings; - struct ifnet *ifp = adapter->ifp; EM_CORE_LOCK_ASSERT(adapter); @@ -3817,6 +3817,7 @@ em_setup_receive_ring(struct rx_ring *rx bus_dma_segment_t seg[1]; int rsize, nsegs, error; + /* Clear the ring contents */ EM_RX_LOCK(rxr); rsize = roundup2(adapter->num_rx_desc * @@ -3860,6 +3861,7 @@ em_setup_receive_ring(struct rx_ring *rx rxr->rx_base[j].buffer_addr = htole64(seg[0].ds_addr); } + /* Setup our descriptor indices */ rxr->next_to_check = 0; rxr->next_to_refresh = 0; @@ -3982,7 +3984,6 @@ em_free_receive_buffers(struct rx_ring * * Enable receive unit. * **********************************************************************/ - #define MAX_INTS_PER_SEC 8000 #define DEFAULT_ITR 1000000000/(MAX_INTS_PER_SEC * 256)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006281406.o5SE6jbN024992>