]> git.proxmox.com Git - qemu.git/commit
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)
commitc3dd94b129e222e00a4ed00689e11afdd85c740f
treeb189ff27f0ce3ae57887515fb5b4f9d6eea1127f
parentda1a4cef9e125a866f4ef9a39b342c2913727f70
parent83f58e570f21c3e7227e7fbef1fc0e18b5ed7ea9
Merge remote-tracking branch 'stefanha/net' into staging

* 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>