diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-08 13:12:25 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-08 13:12:25 -0500 |
| commit | 1f8010f0790b53e5a75dbbd3e14868759ac00e6c (patch) | |
| tree | c652526d13a4bf328158e16373b74237b34ae693 /hw/vmxnet3.h | |
| parent | 7c2acc7062fe863cb71ff5849bb121deafe8df4b (diff) | |
| parent | 389dd80795c646c914ab3c4366c9409e309f0e4f (diff) | |
| download | focaccia-qemu-1f8010f0790b53e5a75dbbd3e14868759ac00e6c.tar.gz focaccia-qemu-1f8010f0790b53e5a75dbbd3e14868759ac00e6c.zip | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Dmitry Fleytman # Via Stefan Hajnoczi * stefanha/net: vmxnet3: const_cpu_to_le64 wrapping for feature bits dropped vmxnet3: iPXE compatibility fixes Message-id: 1365435829-23535-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/vmxnet3.h')
| -rw-r--r-- | hw/vmxnet3.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hw/vmxnet3.h b/hw/vmxnet3.h index 7db0c8f5e0..4eae7c76be 100644 --- a/hw/vmxnet3.h +++ b/hw/vmxnet3.h @@ -37,10 +37,8 @@ #define __packed QEMU_PACKED #if defined(HOST_WORDS_BIGENDIAN) -#define const_cpu_to_le64(x) bswap_64(x) #define __BIG_ENDIAN_BITFIELD #else -#define const_cpu_to_le64(x) (x) #endif /* @@ -137,10 +135,10 @@ struct UPT1_RSSConf { /* features */ enum { - UPT1_F_RXCSUM = const_cpu_to_le64(0x0001), /* rx csum verification */ - UPT1_F_RSS = const_cpu_to_le64(0x0002), - UPT1_F_RXVLAN = const_cpu_to_le64(0x0004), /* VLAN tag stripping */ - UPT1_F_LRO = const_cpu_to_le64(0x0008), + UPT1_F_RXCSUM = 0x0001, /* rx csum verification */ + UPT1_F_RSS = 0x0002, + UPT1_F_RXVLAN = 0x0004, /* VLAN tag stripping */ + UPT1_F_LRO = 0x0008, }; /* all registers are 32 bit wide */ @@ -752,7 +750,6 @@ struct Vmxnet3_DriverShared { #undef __le32 #undef __le64 #undef __packed -#undef const_cpu_to_le64 #if defined(HOST_WORDS_BIGENDIAN) #undef __BIG_ENDIAN_BITFIELD #endif |