diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 12:45:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 12:45:54 +0100 |
| commit | 76fbbec9315f8712d921411fbb4dad1fbcf1b151 (patch) | |
| tree | 30b76243b8a5c98b64840c40e65597f94c08bfa0 /include | |
| parent | 2d80e0ab4b4326e340df7e0bcc687b2bc63c68d8 (diff) | |
| parent | 5e80dd223ded254b1802bdd6417ef118456eadce (diff) | |
| download | qemu-76fbbec9315f8712d921411fbb4dad1fbcf1b151.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
Net patches
# gpg: Signature made Fri 27 Jun 2014 14:10:57 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/net-pull-request:
hw/net/eepro100: Implement read-only bits in MDI registers
net: move queue number into NICPeers
net: L2TPv3 transport
qemu-bridge-helper: Fix fd leak in main()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/net.h b/include/net/net.h index 8b189da5ee..ed594f9bdb 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -24,13 +24,13 @@ struct MACAddr { typedef struct NICPeers { NetClientState *ncs[MAX_QUEUE_NUM]; + int32_t queues; } NICPeers; typedef struct NICConf { MACAddr macaddr; NICPeers peers; int32_t bootindex; - int32_t queues; } NICConf; #define DEFINE_NIC_PROPERTIES(_state, _conf) \ |