| Message ID | 20180108172904.8772-9-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | add HOST_SUPPORTS_UNALIGNED_ACCESS, reduce slirp warnings | expand |
On 08.01.2018 18:29, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > slirp/ip.h | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/slirp/ip.h b/slirp/ip.h > index e29ccd3c9f..71c3642cfe 100644 > --- a/slirp/ip.h > +++ b/slirp/ip.h > @@ -233,17 +233,4 @@ struct ipasfrag { > #define ipf_next ipf_link.next > #define ipf_prev ipf_link.prev > > -/* > - * Structure stored in mbuf in inpcb.ip_options > - * and passed to ip_output when ip options are in use. > - * The actual length of the options (including ipopt_dst) > - * is in m_len. > - */ > -#define MAX_IPOPTLEN 40 > - > -struct ipoption { > - struct in_addr ipopt_dst; /* first-hop dst if source routed */ > - int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */ > -} QEMU_PACKED; > - > #endif > Reviewed-by: Thomas Huth <thuth@redhat.com>
Thomas Huth, on lun. 08 janv. 2018 20:02:14 +0100, wrote: > On 08.01.2018 18:29, Philippe Mathieu-Daudé wrote: > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > --- > > slirp/ip.h | 13 ------------- > > 1 file changed, 13 deletions(-) > > > > diff --git a/slirp/ip.h b/slirp/ip.h > > index e29ccd3c9f..71c3642cfe 100644 > > --- a/slirp/ip.h > > +++ b/slirp/ip.h > > @@ -233,17 +233,4 @@ struct ipasfrag { > > #define ipf_next ipf_link.next > > #define ipf_prev ipf_link.prev > > > > -/* > > - * Structure stored in mbuf in inpcb.ip_options > > - * and passed to ip_output when ip options are in use. > > - * The actual length of the options (including ipopt_dst) > > - * is in m_len. > > - */ > > -#define MAX_IPOPTLEN 40 > > - > > -struct ipoption { > > - struct in_addr ipopt_dst; /* first-hop dst if source routed */ > > - int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */ > > -} QEMU_PACKED; > > - > > #endif > > > > Reviewed-by: Thomas Huth <thuth@redhat.com> Applied to my tree. Thanks, Samuel
diff --git a/slirp/ip.h b/slirp/ip.h index e29ccd3c9f..71c3642cfe 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -233,17 +233,4 @@ struct ipasfrag { #define ipf_next ipf_link.next #define ipf_prev ipf_link.prev -/* - * Structure stored in mbuf in inpcb.ip_options - * and passed to ip_output when ip options are in use. - * The actual length of the options (including ipopt_dst) - * is in m_len. - */ -#define MAX_IPOPTLEN 40 - -struct ipoption { - struct in_addr ipopt_dst; /* first-hop dst if source routed */ - int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */ -} QEMU_PACKED; - #endif
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- slirp/ip.h | 13 ------------- 1 file changed, 13 deletions(-)