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

Move m_getcl() into its own function. This also fixes a bug where the m_adj for

Browse Source 
ETHER_ALIGN was having no effect since m_len had not been set.
This commit is contained in:
Andrew Thompson 2009-03-08 06:56:13 +00:00
parent 05fa9d9f25
commit 75fd0939b4
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/usb/net/if_cdce.c
View File

@ -665,13 +665,10 @@ cdce_bulk_read_callback(struct usb2_xfer *xfer)
*/ */
for (x = 0; x != 1; x++) { for (x = 0; x != 1; x++) {
if (sc->sc_rx_buf[x] == NULL) { if (sc->sc_rx_buf[x] == NULL) {
m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); m = usb2_ether_newbuf();
if (m == NULL) if (m == NULL)
goto tr_stall; goto tr_stall;
sc->sc_rx_buf[x] = m; sc->sc_rx_buf[x] = m;
/* adjust for ethernet */
m->m_len = m->m_pkthdr.len = MCLBYTES;
m_adj(m, ETHER_ALIGN);
} else { } else {
m = sc->sc_rx_buf[x]; m = sc->sc_rx_buf[x];
} }

19
sys/dev/usb/net/usb_ethernet.c
View File

@ -512,6 +512,20 @@ static moduledata_t usb2_ether_mod = {
0 0
}; };
struct mbuf *
usb2_ether_newbuf(void)
{
struct mbuf *m_new;
m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
if (m_new == NULL)
return (NULL);
m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
m_adj(m_new, ETHER_ALIGN);
return (m_new);
}
int int
usb2_ether_rxmbuf(struct usb2_ether *ue, struct mbuf *m, usb2_ether_rxmbuf(struct usb2_ether *ue, struct mbuf *m,
unsigned int len) unsigned int len)
@ -539,16 +553,15 @@ usb2_ether_rxbuf(struct usb2_ether *ue, struct usb2_page_cache *pc,
UE_LOCK_ASSERT(ue, MA_OWNED); UE_LOCK_ASSERT(ue, MA_OWNED);
if (len < ETHER_HDR_LEN || len > MCLBYTES) if (len < ETHER_HDR_LEN || len > MCLBYTES - ETHER_ALIGN)
return (1); return (1);
m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); m = usb2_ether_newbuf();
if (m == NULL) { if (m == NULL) {
ifp->if_ierrors++; ifp->if_ierrors++;
return (ENOMEM); return (ENOMEM);
} }
m_adj(m, ETHER_ALIGN);
usb2_copy_out(pc, offset, mtod(m, uint8_t *), len); usb2_copy_out(pc, offset, mtod(m, uint8_t *), len);
/* finalize mbuf */ /* finalize mbuf */

1
sys/dev/usb/net/usb_ethernet.h
View File

@ -111,6 +111,7 @@ void *usb2_ether_getsc(struct usb2_ether *);
int usb2_ether_ifattach(struct usb2_ether *); int usb2_ether_ifattach(struct usb2_ether *);
void usb2_ether_ifdetach(struct usb2_ether *); void usb2_ether_ifdetach(struct usb2_ether *);
int usb2_ether_ioctl(struct ifnet *, u_long, caddr_t); int usb2_ether_ioctl(struct ifnet *, u_long, caddr_t);
struct mbuf *usb2_ether_newbuf(void);
int usb2_ether_rxmbuf(struct usb2_ether *, struct mbuf *, int usb2_ether_rxmbuf(struct usb2_ether *, struct mbuf *,
unsigned int); unsigned int);
int usb2_ether_rxbuf(struct usb2_ether *, int usb2_ether_rxbuf(struct usb2_ether *,