Date: Mon, 30 Dec 2013 19:12:49 -0500 From: Glen Barber <gjb@FreeBSD.org> To: Eric Davis <edavis@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r260114 - stable/10/sys/dev/bxe Message-ID: <20131231001249.GK1748@glenbarber.us> In-Reply-To: <201312302346.rBUNkZjZ084241@svn.freebsd.org> References: <201312302346.rBUNkZjZ084241@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Ucgz5Oc/kKURWzXs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 30, 2013 at 11:46:35PM +0000, Eric Davis wrote: > Author: edavis > Date: Mon Dec 30 23:46:35 2013 > New Revision: 260114 > URL: http://svnweb.freebsd.org/changeset/base/260114 >=20 > Log: > Approved by: re@ (gjb) > Approved by: davidch (mentor) It was not approved by re@, as stable/10 is not frozen. Glen >=20 > Modified: > stable/10/sys/dev/bxe/bxe.c > stable/10/sys/dev/bxe/ecore_sp.c > Directory Properties: > stable/10/ (props changed) >=20 > Modified: stable/10/sys/dev/bxe/bxe.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/10/sys/dev/bxe/bxe.c Mon Dec 30 23:02:26 2013 (r260113) > +++ stable/10/sys/dev/bxe/bxe.c Mon Dec 30 23:46:35 2013 (r260114) > @@ -34,7 +34,7 @@ > #include <sys/cdefs.h> > __FBSDID("$FreeBSD$"); > =20 > -#define BXE_DRIVER_VERSION "1.78.75" > +#define BXE_DRIVER_VERSION "1.78.76" > =20 > #include "bxe.h" > #include "ecore_sp.h" > @@ -5004,6 +5004,7 @@ bxe_dump_mbuf(struct bxe_softc *sc, > uint8_t contents) > { > char * type; > + int i =3D 0; > =20 > if (!(sc->debug & DBG_MBUF)) { > return; > @@ -5016,28 +5017,21 @@ bxe_dump_mbuf(struct bxe_softc *sc, > =20 > while (m) { > BLOGD(sc, DBG_MBUF, > - "mbuf=3D%p m_len=3D%d m_flags=3D0x%b m_data=3D%p\n", > - m, m->m_len, m->m_flags, > - "\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_RDONLY", m->m_data); > + "%02d: mbuf=3D%p m_len=3D%d m_flags=3D0x%b m_data=3D%p\n", > + i, m, m->m_len, m->m_flags, M_FLAG_BITS, m->m_data); > =20 > if (m->m_flags & M_PKTHDR) { > BLOGD(sc, DBG_MBUF, > - "- m_pkthdr: len=3D%d flags=3D0x%b csum_flags=3D%b\n", > - m->m_pkthdr.len, m->m_flags, > - "\20\12M_BCAST\13M_MCAST\14M_FRAG" > - "\15M_FIRSTFRAG\16M_LASTFRAG\21M_VLANTAG" > - "\22M_PROMISC\23M_NOFREE", > - (int)m->m_pkthdr.csum_flags, > - "\20\1CSUM_IP\2CSUM_TCP\3CSUM_UDP\4CSUM_IP_FRAGS" > - "\5CSUM_FRAGMENT\6CSUM_TSO\11CSUM_IP_CHECKED" > - "\12CSUM_IP_VALID\13CSUM_DATA_VALID" > - "\14CSUM_PSEUDO_HDR"); > + "%02d: - m_pkthdr: tot_len=3D%d flags=3D0x%b csum_fla= gs=3D%b\n", > + i, m->m_pkthdr.len, m->m_flags, M_FLAG_BITS, > + (int)m->m_pkthdr.csum_flags, CSUM_BITS); > } > =20 > if (m->m_flags & M_EXT) { > switch (m->m_ext.ext_type) { > case EXT_CLUSTER: type =3D "EXT_CLUSTER"; break; > case EXT_SFBUF: type =3D "EXT_SFBUF"; break; > + case EXT_JUMBOP: type =3D "EXT_JUMBOP"; break; > case EXT_JUMBO9: type =3D "EXT_JUMBO9"; break; > case EXT_JUMBO16: type =3D "EXT_JUMBO16"; break; > case EXT_PACKET: type =3D "EXT_PACKET"; break; > @@ -5050,8 +5044,8 @@ bxe_dump_mbuf(struct bxe_softc *sc, > } > =20 > BLOGD(sc, DBG_MBUF, > - "- m_ext: %p ext_size=3D%d, type=3D%s\n", > - m->m_ext.ext_buf, m->m_ext.ext_size, type); > + "%02d: - m_ext: %p ext_size=3D%d type=3D%s\n", > + i, m->m_ext.ext_buf, m->m_ext.ext_size, type); > } > =20 > if (contents) { > @@ -5059,6 +5053,7 @@ bxe_dump_mbuf(struct bxe_softc *sc, > } > =20 > m =3D m->m_next; > + i++; > } > } > =20 > @@ -5669,6 +5664,7 @@ bxe_tx_encap_continue: > /* split the first BD into header/data making the fw job eas= y */ > nbds++; > tx_start_bd->nbd =3D htole16(nbds); > + tx_start_bd->nbytes =3D htole16(hlen); > =20 > bd_prod =3D TX_BD_NEXT(bd_prod); > =20 >=20 > Modified: stable/10/sys/dev/bxe/ecore_sp.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/10/sys/dev/bxe/ecore_sp.c Mon Dec 30 23:02:26 2013 (r260113) > +++ stable/10/sys/dev/bxe/ecore_sp.c Mon Dec 30 23:46:35 2013 (r260114) > @@ -4264,7 +4264,7 @@ void ecore_init_mac_credit_pool(struct b > if (!CHIP_REV_IS_SLOW(sc)) > cam_sz =3D (MAX_MAC_CREDIT_E2 > - GET_NUM_VFS_PER_PATH(sc)) > - / func_num=20 > + / func_num > + GET_NUM_VFS_PER_PF(sc); > else > cam_sz =3D ECORE_CAM_SIZE_EMUL; > @@ -4443,8 +4443,11 @@ int ecore_config_rss(struct bxe_softc *s > struct ecore_raw_obj *r =3D &o->raw; > =20 > /* Do nothing if only driver cleanup was requested */ > - if (ECORE_TEST_BIT(RAMROD_DRV_CLR_ONLY, &p->ramrod_flags)) > + if (ECORE_TEST_BIT(RAMROD_DRV_CLR_ONLY, &p->ramrod_flags)) { > + ECORE_MSG(sc, "Not configuring RSS ramrod_flags=3D%lx\n", > + p->ramrod_flags); > return ECORE_SUCCESS; > + } > =20 > r->set_pending(r); > =20 --Ucgz5Oc/kKURWzXs Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSwgwBAAoJELls3eqvi17Qs/UQAIATaNrfZV0SYgV89CvMOKJ+ Bv6vuZBfKUMNHRSNjxfEaB2uN9Zsl2gFfXPX9Iummh2qDxQm3oHQVmt0BjgvT+9V 2Wne1eKo1IInNE87j5oEOv9rWx+uXFMucGjGFPb9cFXQimp7jkhr2pYXtw4dX/Uv QP/EwYZ74Rhnsq+c3R2lwkkoGYxEoU4yRbYQkw6T/jmKfMqqteWVUK7GALMbEpvv cnRvRDUzsMo/iM6OqqRFJCFWAuICw1lndz6QgD1fzPY1YSZ+izzmEyjzxmHsHyud eJ1SvkMSqpc6gpa4Fl7/BCIIFhF2pNy0U7lE2IQGhwlkFpMSAlf4gfch2vZsQhyg 9Pwq3WJr3zCUnQ2tdq7a3ny97tD7EmoshhN78u3KiG5qDSu4n6JZBpu9D1Ev2cX9 MzI+gZR75JydwIaa6uWemRXwFkBS5yReK10CxEb8zVD+LgBJHDEiYg7cKWk9EmEZ YCbAlSAJOoW/ZI0M/UY/eM1Hk+RniBrrEZJD9O/CTggf28odSXNj4D8mNXXjTADL o9sk+76uIHGrx4Cl0Q7s7YRoNxHlPUhwupA/Eu2y2vF885oY3JhDboY3jrEho+Aj TmTEngUKu1AVRs/snPOle0L+Gd1V0Pdi0KCBXTTmgjj8F/0/PifdBwxbA+f3+uVS lkekMA1n4ULrl8yBYoUE =VmDe -----END PGP SIGNATURE----- --Ucgz5Oc/kKURWzXs--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231001249.GK1748>