From: Lei Xia <lxia@northwestern.edu>
Date: Tue, 23 Nov 2010 04:00:52 +0000 (-0600)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb5eb0f70b84003972a96060c76bd7efad340be4;p=palacios-OLD.git

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel

Conflicts:

	palacios/src/devices/nic_bridge.c
---

eb5eb0f70b84003972a96060c76bd7efad340be4
diff --cc palacios/src/devices/nic_bridge.c
index eb5500b,00ce9b6..b77e6e6
--- a/palacios/src/devices/nic_bridge.c
+++ b/palacios/src/devices/nic_bridge.c
@@@ -49,12 -49,12 +49,11 @@@ static int bridge_send(uint8_t * buf, u
      return V3_send_raw(buf, len);
  }
  
--
- static int packet_input(struct v3_vm_info * vm, 
- 			     struct v3_packet_event * evt, 
- 			     void * private_data) {
-     struct nic_bridge_state *bridge = (struct nic_bridge_state *)private_data;
- 
+ static int packet_input(struct v3_vm_info * vm,
+ 			struct v3_packet_event * evt, 
+ 			void * private_data) {
+     struct nic_bridge_state * bridge = (struct nic_bridge_state *)private_data;
 -
++ 
      PrintDebug("NIC_BRIDGE: Incoming packet size: %d\n", evt->size);
  
      return bridge->net_ops.recv(evt->pkt,