diff options
| author | adrian <adrian@FreeBSD.org> | 2009-05-18 04:56:37 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2009-05-18 04:56:37 +0000 |
| commit | 7f0067a49accca75c427818d1f484d46ed746f71 (patch) | |
| tree | 04c0586363012de391eeb0a012a96bcbf5604991 /sys/dev/xen/netfront | |
| parent | 646dc483a53c87197ffb30197dc7b487e35e5603 (diff) | |
| download | FreeBSD-src-7f0067a49accca75c427818d1f484d46ed746f71.zip FreeBSD-src-7f0067a49accca75c427818d1f484d46ed746f71.tar.gz | |
The merge in r189699 reverted part of the work done in a previous commit
(r188036.)
Re-revert that change so the Xen networking functions again.
Diffstat (limited to 'sys/dev/xen/netfront')
| -rw-r--r-- | sys/dev/xen/netfront/netfront.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index a70c47c..f6b6641 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -1297,11 +1297,12 @@ xennet_get_responses(struct netfront_info *np, gnttab_release_grant_reference(&np->gref_rx_head, ref); next: - if (m != NULL) { - m->m_len = rx->status; - m->m_data += rx->offset; - m0->m_pkthdr.len += rx->status; - } + if (m == NULL) + break; + + m->m_len = rx->status; + m->m_data += rx->offset; + m0->m_pkthdr.len += rx->status; if (!(rx->flags & NETRXF_more_data)) break; |
