diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-11 09:03:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-11 09:03:56 +0300 |
| commit | 3e7fb80b604b5bc7116fe374f604eb7c85f00b43 (patch) | |
| tree | a5ff31fcdaf90aeef679b5ca193aa8c84d25f428 /include/uapi | |
| parent | 231edca97f947f50e18fa2f6d9c8285c3314232b (diff) | |
| parent | 1276f24eeef207e5572649d069ba1b531b2e2c3a (diff) | |
| download | linux-3e7fb80b604b5bc7116fe374f604eb7c85f00b43.tar.xz | |
Merge branch 'virtio_net-GSO-helpers'
Mike Rapoport says:
====================
virtio_net: use common code for virtio_net_hdr and skb GSO conversion
This patches introduce virtio_net_hdr_{from,to}_skb functions for
conversion of GSO information between skb and virtio_net_hdr.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/virtio_net.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index 0da0e3a98f17..fc353b518288 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_VIRTIO_NET_H -#define _LINUX_VIRTIO_NET_H +#ifndef _UAPI_LINUX_VIRTIO_NET_H +#define _UAPI_LINUX_VIRTIO_NET_H /* This header is BSD licensed so anyone can use the definitions to implement * compatible drivers/servers. * @@ -245,4 +245,4 @@ struct virtio_net_ctrl_mq { #define VIRTIO_NET_CTRL_GUEST_OFFLOADS 5 #define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET 0 -#endif /* _LINUX_VIRTIO_NET_H */ +#endif /* _UAPI_LINUX_VIRTIO_NET_H */ |