]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 Jan 2013 16:36:13 +0000 (10:36 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 Jan 2013 16:36:13 +0000 (10:36 -0600)
* stefanha/net:
  rtl8139: preserve link state across device reset
  e1000: no need auto-negotiation if link was down
  net: clean up network at qemu process termination
  e1000: Discard oversized packets based on SBP|LPE

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge