diff options
| author |   visa <visa@openbsd.org> | 2016-05-24 12:56:14 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2016-05-24 12:56:14 +0000 |
| commit | ff08e424a2756b1ad24aea687e17be053e8152fc (patch) | |
| tree | d826e7d4b993f20395c722f6d826b39a7953c5a8 | |
| parent | Fix previous. (diff) | |
| download | wireguard-openbsd-ff08e424a2756b1ad24aea687e17be053e8152fc.tar.xz wireguard-openbsd-ff08e424a2756b1ad24aea687e17be053e8152fc.zip | |
Try to defragment overly long mbuf chains.
ok mpi@
| -rw-r--r-- | sys/arch/octeon/dev/if_cnmac.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c index 80750805f14..268349d5898 100644 --- a/sys/arch/octeon/dev/if_cnmac.c +++ b/sys/arch/octeon/dev/if_cnmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnmac.c,v 1.47 2016/05/24 12:50:14 visa Exp $ */ +/* $OpenBSD: if_cnmac.c,v 1.48 2016/05/24 12:56:14 visa Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -788,7 +788,7 @@ octeon_eth_send_makecmd_gbuf(struct octeon_eth_softc *sc, struct mbuf *m0, continue; if (segs >= OCTEON_POOL_SIZE_SG / sizeof(uint64_t)) - return 1; + goto defrag; gbuf[segs] = octeon_eth_send_makecmd_w1(m->m_len, KVTOPHYS(m->m_data)); segs++; @@ -797,6 +797,13 @@ octeon_eth_send_makecmd_gbuf(struct octeon_eth_softc *sc, struct mbuf *m0, *rsegs = segs; return 0; + +defrag: + if (m_defrag(m0, M_DONTWAIT) != 0) + return 1; + gbuf[0] = octeon_eth_send_makecmd_w1(m0->m_len, KVTOPHYS(m0->m_data)); + *rsegs = 1; + return 0; } int |