Merge remote-tracking branch 'bonzini/scsi-next' into staging

[qemu.git] / slirp / ip_output.c

diff --git a/slirp/ip_output.c b/slirp/ip_output.c
index 94bb0f27eb1bd1c23b10852b04606a6f494b882d..c82830fe7d299236b04090e2199d20c4602b95d8 100644 (file)
--- a/slirp/ip_output.c
+++ b/slirp/ip_output.c
@@ -40,8 +40,6 @@
 
 #include <slirp.h>
 
-u_int16_t ip_id;
-
 /* Number of packets queued before we start sending
  * (to prevent allocing too many mbufs) */
 #define IF_THRESH 10
@@ -55,6 +53,7 @@ u_int16_t ip_id;
 int
 ip_output(struct socket *so, struct mbuf *m0)
 {
+       Slirp *slirp = m0->slirp;
        register struct ip *ip;
        register struct mbuf *m = m0;
        register int hlen = sizeof(struct ip );
@@ -70,16 +69,15 @@ ip_output(struct socket *so, struct mbuf *m0)
         */
        ip->ip_v = IPVERSION;
        ip->ip_off &= IP_DF;
-       ip->ip_id = htons(ip_id++);
+       ip->ip_id = htons(slirp->ip_id++);
        ip->ip_hl = hlen >> 2;
-       STAT(ipstat.ips_localout++);
 
        /*
         * If small enough for interface, can just send directly.
         */
-       if ((u_int16_t)ip->ip_len <= IF_MTU) {
-               ip->ip_len = htons((u_int16_t)ip->ip_len);
-               ip->ip_off = htons((u_int16_t)ip->ip_off);
+       if ((uint16_t)ip->ip_len <= IF_MTU) {
+               ip->ip_len = htons((uint16_t)ip->ip_len);
+               ip->ip_off = htons((uint16_t)ip->ip_off);
                ip->ip_sum = 0;
                ip->ip_sum = cksum(m, hlen);
 
@@ -93,7 +91,6 @@ ip_output(struct socket *so, struct mbuf *m0)
         */
        if (ip->ip_off & IP_DF) {
                error = -1;
-               STAT(ipstat.ips_cantfrag++);
                goto bad;
        }
 
@@ -113,12 +110,11 @@ ip_output(struct socket *so, struct mbuf *m0)
         */
        m0 = m;
        mhlen = sizeof (struct ip);
-       for (off = hlen + len; off < (u_int16_t)ip->ip_len; off += len) {
+       for (off = hlen + len; off < (uint16_t)ip->ip_len; off += len) {
          register struct ip *mhip;
-         m = m_get();
+         m = m_get(slirp);
           if (m == NULL) {
            error = -1;
-           STAT(ipstat.ips_odropped++);
            goto sendorfree;
          }
          m->m_data += IF_MAXLINKHDR;
@@ -129,32 +125,31 @@ ip_output(struct socket *so, struct mbuf *m0)
          mhip->ip_off = ((off - hlen) >> 3) + (ip->ip_off & ~IP_MF);
          if (ip->ip_off & IP_MF)
            mhip->ip_off |= IP_MF;
-         if (off + len >= (u_int16_t)ip->ip_len)
-           len = (u_int16_t)ip->ip_len - off;
+         if (off + len >= (uint16_t)ip->ip_len)
+           len = (uint16_t)ip->ip_len - off;
          else
            mhip->ip_off |= IP_MF;
-         mhip->ip_len = htons((u_int16_t)(len + mhlen));
+         mhip->ip_len = htons((uint16_t)(len + mhlen));
 
          if (m_copy(m, m0, off, len) < 0) {
            error = -1;
            goto sendorfree;
          }
 
-         mhip->ip_off = htons((u_int16_t)mhip->ip_off);
+         mhip->ip_off = htons((uint16_t)mhip->ip_off);
          mhip->ip_sum = 0;
          mhip->ip_sum = cksum(m, mhlen);
          *mnext = m;
          mnext = &m->m_nextpkt;
-         STAT(ipstat.ips_ofragments++);
        }
        /*
         * Update first fragment by trimming what's been copied out
         * and updating header, then send each fragment (in order).
         */
        m = m0;
-       m_adj(m, hlen + firstlen - (u_int16_t)ip->ip_len);
-       ip->ip_len = htons((u_int16_t)m->m_len);
-       ip->ip_off = htons((u_int16_t)(ip->ip_off | IP_MF));
+       m_adj(m, hlen + firstlen - (uint16_t)ip->ip_len);
+       ip->ip_len = htons((uint16_t)m->m_len);
+       ip->ip_off = htons((uint16_t)(ip->ip_off | IP_MF));
        ip->ip_sum = 0;
        ip->ip_sum = cksum(m, hlen);
 sendorfree:
@@ -164,17 +159,14 @@ sendorfree:
                if (error == 0)
                        if_output(so, m);
                else
-                       m_freem(m);
+                       m_free(m);
        }
-
-       if (error == 0)
-               STAT(ipstat.ips_fragmented++);
     }
 
 done:
        return (error);
 
 bad:
-       m_freem(m0);
+       m_free(m0);
        goto done;
 }