| Message ID | 864430f2a613c4d3c82b591ed7bc27068ddad369.1519961667.git.jbaron@akamai.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 01, 2018 at 10:46:33PM -0500, Jason Baron wrote: > Pull in definitions for SPEED_UNKNOWN, DUPLEX_UNKNOWN, DUPLEX_HALF, > and DUPLEX_FULL. > > Signed-off-by: Jason Baron <jbaron@akamai.com> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Jason Wang <jasowang@redhat.com> > Cc: virtio-dev@lists.oasis-open.org > --- > include/net/eth.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/include/net/eth.h b/include/net/eth.h > index 09054a5..9843678 100644 > --- a/include/net/eth.h > +++ b/include/net/eth.h > @@ -417,4 +417,11 @@ bool > eth_parse_ipv6_hdr(const struct iovec *pkt, int pkt_frags, > size_t ip6hdr_off, eth_ip6_hdr_info *info); > > +/* ethtool defines - from linux/ethtool.h */ > +#define SPEED_UNKNOWN -1 > + > +#define DUPLEX_HALF 0x00 > +#define DUPLEX_FULL 0x01 > +#define DUPLEX_UNKNOWN 0xff > + > #endif While that's not a lot, I think we should import linux/ethtool.h into include/standard-headers/linux/ using scripts/update-linux-headers.sh > -- > 2.7.4
On 03/02/2018 12:54 PM, Michael S. Tsirkin wrote: > On Thu, Mar 01, 2018 at 10:46:33PM -0500, Jason Baron wrote: >> Pull in definitions for SPEED_UNKNOWN, DUPLEX_UNKNOWN, DUPLEX_HALF, >> and DUPLEX_FULL. >> >> Signed-off-by: Jason Baron <jbaron@akamai.com> >> Cc: "Michael S. Tsirkin" <mst@redhat.com> >> Cc: Jason Wang <jasowang@redhat.com> >> Cc: virtio-dev@lists.oasis-open.org >> --- >> include/net/eth.h | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/include/net/eth.h b/include/net/eth.h >> index 09054a5..9843678 100644 >> --- a/include/net/eth.h >> +++ b/include/net/eth.h >> @@ -417,4 +417,11 @@ bool >> eth_parse_ipv6_hdr(const struct iovec *pkt, int pkt_frags, >> size_t ip6hdr_off, eth_ip6_hdr_info *info); >> >> +/* ethtool defines - from linux/ethtool.h */ >> +#define SPEED_UNKNOWN -1 >> + >> +#define DUPLEX_HALF 0x00 >> +#define DUPLEX_FULL 0x01 >> +#define DUPLEX_UNKNOWN 0xff >> + >> #endif > > While that's not a lot, I think we should import linux/ethtool.h into > include/standard-headers/linux/ using scripts/update-linux-headers.sh > Ok, I had started down that path, by including include/uapi/linux/ethtool.h but that resulted in a few other headers - kernel.h, sysinfo.h. And so it seemed like a lot of headers for only a few lines. But I will re-visit it... Thanks, -Jason
On Tue, Mar 06, 2018 at 12:53:14PM -0500, Jason Baron wrote: > > > On 03/02/2018 12:54 PM, Michael S. Tsirkin wrote: > > On Thu, Mar 01, 2018 at 10:46:33PM -0500, Jason Baron wrote: > >> Pull in definitions for SPEED_UNKNOWN, DUPLEX_UNKNOWN, DUPLEX_HALF, > >> and DUPLEX_FULL. > >> > >> Signed-off-by: Jason Baron <jbaron@akamai.com> > >> Cc: "Michael S. Tsirkin" <mst@redhat.com> > >> Cc: Jason Wang <jasowang@redhat.com> > >> Cc: virtio-dev@lists.oasis-open.org > >> --- > >> include/net/eth.h | 7 +++++++ > >> 1 file changed, 7 insertions(+) > >> > >> diff --git a/include/net/eth.h b/include/net/eth.h > >> index 09054a5..9843678 100644 > >> --- a/include/net/eth.h > >> +++ b/include/net/eth.h > >> @@ -417,4 +417,11 @@ bool > >> eth_parse_ipv6_hdr(const struct iovec *pkt, int pkt_frags, > >> size_t ip6hdr_off, eth_ip6_hdr_info *info); > >> > >> +/* ethtool defines - from linux/ethtool.h */ > >> +#define SPEED_UNKNOWN -1 > >> + > >> +#define DUPLEX_HALF 0x00 > >> +#define DUPLEX_FULL 0x01 > >> +#define DUPLEX_UNKNOWN 0xff > >> + > >> #endif > > > > While that's not a lot, I think we should import linux/ethtool.h into > > include/standard-headers/linux/ using scripts/update-linux-headers.sh > > > > Ok, I had started down that path, by including > include/uapi/linux/ethtool.h but that resulted in a few other headers - > kernel.h, sysinfo.h. And so it seemed like a lot of headers for only a > few lines. But I will re-visit it... > > Thanks, > > -Jason I don't know why is sysinfo there. Want to try sending a patch to drop it from linux/kernel.h?
On 03/06/2018 01:15 PM, Michael S. Tsirkin wrote: > On Tue, Mar 06, 2018 at 12:53:14PM -0500, Jason Baron wrote: >> >> >> On 03/02/2018 12:54 PM, Michael S. Tsirkin wrote: >>> On Thu, Mar 01, 2018 at 10:46:33PM -0500, Jason Baron wrote: >>>> Pull in definitions for SPEED_UNKNOWN, DUPLEX_UNKNOWN, DUPLEX_HALF, >>>> and DUPLEX_FULL. >>>> >>>> Signed-off-by: Jason Baron <jbaron@akamai.com> >>>> Cc: "Michael S. Tsirkin" <mst@redhat.com> >>>> Cc: Jason Wang <jasowang@redhat.com> >>>> Cc: virtio-dev@lists.oasis-open.org >>>> --- >>>> include/net/eth.h | 7 +++++++ >>>> 1 file changed, 7 insertions(+) >>>> >>>> diff --git a/include/net/eth.h b/include/net/eth.h >>>> index 09054a5..9843678 100644 >>>> --- a/include/net/eth.h >>>> +++ b/include/net/eth.h >>>> @@ -417,4 +417,11 @@ bool >>>> eth_parse_ipv6_hdr(const struct iovec *pkt, int pkt_frags, >>>> size_t ip6hdr_off, eth_ip6_hdr_info *info); >>>> >>>> +/* ethtool defines - from linux/ethtool.h */ >>>> +#define SPEED_UNKNOWN -1 >>>> + >>>> +#define DUPLEX_HALF 0x00 >>>> +#define DUPLEX_FULL 0x01 >>>> +#define DUPLEX_UNKNOWN 0xff >>>> + >>>> #endif >>> >>> While that's not a lot, I think we should import linux/ethtool.h into >>> include/standard-headers/linux/ using scripts/update-linux-headers.sh >>> >> >> Ok, I had started down that path, by including >> include/uapi/linux/ethtool.h but that resulted in a few other headers - >> kernel.h, sysinfo.h. And so it seemed like a lot of headers for only a >> few lines. But I will re-visit it... >> >> Thanks, >> >> -Jason > > I don't know why is sysinfo there. Want to try sending a patch to > drop it from linux/kernel.h? > Seems like this also ripples into glibc headers, if you look at: /usr/include/x86_64-linux-gnu/sys/sysinfo.h. It also includes kernel.h in order to get struct sysinfo. So that would need updating as well. I've done a v2 that just pulls in sysinfo.h, it doesn't look too bad, but let me know... Thanks, -Jason
diff --git a/include/net/eth.h b/include/net/eth.h index 09054a5..9843678 100644 --- a/include/net/eth.h +++ b/include/net/eth.h @@ -417,4 +417,11 @@ bool eth_parse_ipv6_hdr(const struct iovec *pkt, int pkt_frags, size_t ip6hdr_off, eth_ip6_hdr_info *info); +/* ethtool defines - from linux/ethtool.h */ +#define SPEED_UNKNOWN -1 + +#define DUPLEX_HALF 0x00 +#define DUPLEX_FULL 0x01 +#define DUPLEX_UNKNOWN 0xff + #endif
Pull in definitions for SPEED_UNKNOWN, DUPLEX_UNKNOWN, DUPLEX_HALF, and DUPLEX_FULL. Signed-off-by: Jason Baron <jbaron@akamai.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: virtio-dev@lists.oasis-open.org --- include/net/eth.h | 7 +++++++ 1 file changed, 7 insertions(+)