d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In re_diag(), there's no need for us to call re_start() ourselves:

Browse Source 
IF_HANDOFF() does it for us behind the scenes. Remove the extra call
to re_start() otherwise we try to transmit twice.

In re_encap(), fix the code that guards against consuming too many
descriptors in the TX ring so that it actually works. With the
new 8169S chip, I was able to hit a corner case that drained the
free descriptor count all the way to 0. This is not supposed to
be possible.
This commit is contained in:
Bill Paul 2003-09-18 18:32:15 +00:00
parent 37c1515e47
commit 7cae6651cf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=120208
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -740,11 +740,13 @@ re_diag(sc)
eh->ether_type = htons(ETHERTYPE_IP);
m0->m_pkthdr.len = m0->m_len = ETHER_MIN_LEN - ETHER_CRC_LEN;
/* Queue the packet, start transmission */
/*
* Queue the packet, start transmission.
* Note: IF_HANDOFF() ultimately calls re_start() for us.
*/
IF_HANDOFF(&ifp->if_snd, m0, ifp);
CSR_WRITE_2(sc, RL_ISR, 0xFFFF);
re_start(ifp);
IF_HANDOFF(&ifp->if_snd, m0, ifp);
m0 = NULL;
/* Wait for it to propagate through the chip */
@ -1892,7 +1894,7 @@ re_encap(sc, m_head, idx)
int error;
struct m_tag *mtag;
if (sc->rl_ldata.rl_tx_free < 4)
if (sc->rl_ldata.rl_tx_free <= 4)
return(EFBIG);
/*
@ -1914,6 +1916,8 @@ re_encap(sc, m_head, idx)
arg.sc = sc;
arg.rl_idx = *idx;
arg.rl_maxsegs = sc->rl_ldata.rl_tx_free;
if (arg.rl_maxsegs > 4)
arg.rl_maxsegs -= 4;
arg.rl_ring = sc->rl_ldata.rl_tx_list;
map = sc->rl_ldata.rl_tx_dmamap[*idx];