slirp: Clean up ifs_init

Remove duplicate ifs_init macros, reimplement the logic as static inline
in mbuf.h.

CC: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
CC: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2012-02-17 14:39:30 +01:00
parent b4bd0b168e
commit 79e7e937bd
3 changed files with 5 additions and 4 deletions

View File

@ -8,8 +8,6 @@
#include <slirp.h> #include <slirp.h>
#include "qemu-timer.h" #include "qemu-timer.h"
#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
static void static void
ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead) ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
{ {

View File

@ -20,6 +20,4 @@
/* 2 for alignment, 14 for ethernet, 40 for TCP/IP */ /* 2 for alignment, 14 for ethernet, 40 for TCP/IP */
#define IF_MAXLINKHDR (2 + 14 + 40) #define IF_MAXLINKHDR (2 + 14 + 40)
#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
#endif #endif

View File

@ -124,4 +124,9 @@ void m_adj(struct mbuf *, int);
int m_copy(struct mbuf *, struct mbuf *, int, int); int m_copy(struct mbuf *, struct mbuf *, int, int);
struct mbuf * dtom(Slirp *, void *); struct mbuf * dtom(Slirp *, void *);
static inline void ifs_init(struct mbuf *ifm)
{
ifm->ifs_next = ifm->ifs_prev = ifm;
}
#endif #endif