tree 9c219d95ffb1f84ae3f12a213364e80824cdc2c4
parent 3d0b7b5203fb07847bf13aee567a9c9d7483876b
parent 011de2b512a83aa5e9f8899ed5bbf2f31995b90e
author Anthony Liguori <aliguori@us.ibm.com> 1344020045 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1344020045 -0500

Merge remote-tracking branch 'stefanha/net' into staging

* stefanha/net:
  net: add the support for -netdev socket, listen
  net: fix the coding style
  hub: add the support for hub own flow control
  net: determine if packets can be sent before net queue deliver packets
  net: cleanup deliver/deliver_iov func pointers
  net: Make "info network" output more readable info
  net: Rename qemu_del_vlan_client() to qemu_del_net_client()
  net: Rename vc local variables to nc
  net: Rename VLANClientState to NetClientState
  net: Rename non_vlan_clients to net_clients
  net: Remove VLANState
  net: Remove vlan code from net.c
  net: Convert qdev_prop_vlan to peer with hub
  net: Drop vlan argument to qemu_new_net_client()
  hub: Check that hubs are configured correctly
  net: Look up 'vlan' net clients using hubs
  net: Use hubs for the vlan feature
  net: Add a hub net client
  net: Add interface to bridge when SIOCBRADDIF isn't available