mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-25 16:13:17 +00:00
Code Issues Releases Activity

Always honor configured VLAN/checksum offload capabilities.

Browse Source 
Previously re(4) used to blindly enable VLAN hardware tag stripping
and Rx checksum offload regardless of enabled optional features of
interface.
This commit is contained in:
Pyun YongHyeon 2008-03-23 04:59:13 +00:00
parent 72b218d366
commit 70acaecfd0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=177519
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/re/if_re.c
View File

@ -2410,6 +2410,7 @@ re_init_locked(sc)
struct ifnet *ifp = sc->rl_ifp; struct ifnet *ifp = sc->rl_ifp;
struct mii_data *mii; struct mii_data *mii;
u_int32_t rxcfg = 0; u_int32_t rxcfg = 0;
uint16_t cfg;
union { union {
uint32_t align_dummy; uint32_t align_dummy;
u_char eaddr[ETHER_ADDR_LEN]; u_char eaddr[ETHER_ADDR_LEN];
@ -2429,9 +2430,13 @@ re_init_locked(sc)
* RX checksum offload. We must configure the C+ register * RX checksum offload. We must configure the C+ register
* before all others. * before all others.
*/ */
CSR_WRITE_2(sc, RL_CPLUS_CMD, RL_CPLUSCMD_RXENB| cfg = RL_CPLUSCMD_PCI_MRW;
RL_CPLUSCMD_TXENB|RL_CPLUSCMD_PCI_MRW| if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
RL_CPLUSCMD_VLANSTRIP|RL_CPLUSCMD_RXCSUM_ENB); cfg |= RL_CPLUSCMD_RXCSUM_ENB;
if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0)
cfg |= RL_CPLUSCMD_VLANSTRIP;
CSR_WRITE_2(sc, RL_CPLUS_CMD,
cfg | RL_CPLUSCMD_RXENB | RL_CPLUSCMD_TXENB);
/* /*
* Init our MAC address. Even though the chipset * Init our MAC address. Even though the chipset