On Fri, Apr 24, 2015 at 02:24:38PM +0200, Greg Kurz wrote:
> Signed-off-by: Greg Kurz <gkurz@xxxxxxxxxxxxxxxxxx>
Dave, could you please ack merging this through
the virtio tree?
> ---
> drivers/net/tun.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index 857dca4..3c3d6c0 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -206,14 +206,19 @@ struct tun_struct {
> u32 flow_count;
> };
>
> +static inline bool tun_is_little_endian(struct tun_struct *tun)
> +{
> + return tun->flags & TUN_VNET_LE;
> +}
> +
> static inline u16 tun16_to_cpu(struct tun_struct *tun, __virtio16 val)
> {
> - return __virtio16_to_cpu(tun->flags & TUN_VNET_LE, val);
> + return __virtio16_to_cpu(tun_is_little_endian(tun), val);
> }
>
> static inline __virtio16 cpu_to_tun16(struct tun_struct *tun, u16 val)
> {
> - return __cpu_to_virtio16(tun->flags & TUN_VNET_LE, val);
> + return __cpu_to_virtio16(tun_is_little_endian(tun), val);
> }
>
> static inline u32 tun_hashfn(u32 rxhash)
>
> _______________________________________________
> Virtualization mailing list
> Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
> https://lists.linuxfoundation.org/mailman/listinfo/virtualization
--
To unsubscribe from this list: send the line "unsubscribe linux-api" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
