Commit b27e767e authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 500d76a0 4e60a250

hw/net/e1000.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

    }