-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQEcBAABAgAGBQJVFUYtAAoJEJykq7OBq3PIVMoH/3wEtwjopwb6Di8OrErQCAoL fH2mnKNwW2zIiRDFcALmdOaioi0qXdURkdbLXJSWZ1FwtUg8IKPvGnbJ/vES+k78 dtRtj0RyVVok8yRNd9Z2xuN3zSwjD8r5E1ccZIPdGeHePe9I11F0gOL/kc8yNzYQ /GGkFbriSg1k8Ej/0bZrGguWRF5uiWywIRs6XuwqfrDkXi95fK2d4JYRAMwkC1An YXTHkcCfOwKTfIaTvWlwLkfFUXp9B5t13oNVY2NNhyv70+KZzp/AZinfQFum5PKf Y6LGihXvi7ws02Ko0/opzjHc8us1HaPSFLnC1RAIksZDeK/D6ps5O9a85S+kkDw= =rUqQ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging # gpg: Signature made Fri Mar 27 11:59:41 2015 GMT 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/e1000: fix integer endianness Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
b27e767e8c
|
@ -578,7 +578,7 @@ static inline int
|
|||
is_vlan_packet(E1000State *s, const uint8_t *buf)
|
||||
{
|
||||
return (be16_to_cpup((uint16_t *)(buf + 12)) ==
|
||||
le16_to_cpup((uint16_t *)(s->mac_reg + VET)));
|
||||
le16_to_cpu(s->mac_reg[VET]));
|
||||
}
|
||||
|
||||
static inline int
|
||||
|
@ -711,7 +711,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
|
|||
(tp->cptse || txd_lower & E1000_TXD_CMD_EOP)) {
|
||||
tp->vlan_needed = 1;
|
||||
stw_be_p(tp->vlan_header,
|
||||
le16_to_cpup((uint16_t *)(s->mac_reg + VET)));
|
||||
le16_to_cpu(s->mac_reg[VET]));
|
||||
stw_be_p(tp->vlan_header + 2,
|
||||
le16_to_cpu(dp->upper.fields.special));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue