| commit | 654cd2c5841d70e8053b39fb1a9162d5c113326b | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 3 Sep 2015 10:15:01 +0000 (3 11:15 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 3 Sep 2015 10:15:01 +0000 (3 11:15 +0100) | ||
| tree | 518a8240bbc0733b4b41a3f0aa0d8d71b3fb9a2a | treesnapshot (tar.gz zip) |
| parent | 0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e | commitdiff |
| parent | c5a93780453e6da919287c17e873c843544ef2a3 | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Wed 02 Sep 2015 17:14:40 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:
ne2000: Drop ne2000_can_receive
vmxnet3: Drop net_vmxnet3_info.can_receive
rtl8139: Do not consume the packet during overflow in standard mode.
rtl8139: Fix receive buffer overflow check
rtl8139: use ldl/stl wrapper for unaligned 32-bit access
rtl8139: use net/eth.h macros instead of custom macros
rtl8139: remove duplicate net/eth.h definitions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Wed 02 Sep 2015 17:14:40 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:
ne2000: Drop ne2000_can_receive
vmxnet3: Drop net_vmxnet3_info.can_receive
rtl8139: Do not consume the packet during overflow in standard mode.
rtl8139: Fix receive buffer overflow check
rtl8139: use ldl/stl wrapper for unaligned 32-bit access
rtl8139: use net/eth.h macros instead of custom macros
rtl8139: remove duplicate net/eth.h definitions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>