X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-tunnel.c;h=b197e53a93c9c6e3a5641dff5212424ef60af871;hb=1e827902be9194d71ea851c9ce2676f65eeed33a;hp=a985ce9055147fd250211d62725b14426bdb89bc;hpb=6b4b2f598246e87237342a9179a0d29e202ebe65;p=sliver-openvswitch.git

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index a985ce905..b197e53a9 100644
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -264,8 +264,9 @@ netdev_tunnel_rx_dealloc(struct netdev_rx *rx_)
 }
 
 static int
-netdev_tunnel_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
 {
+    size_t size = ofpbuf_tailroom(buffer);
     struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
     struct netdev_tunnel *netdev =
         netdev_tunnel_cast(rx_->netdev);
@@ -273,12 +274,12 @@ netdev_tunnel_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
         return -EAGAIN;
     for (;;) {
         ssize_t retval;
-        retval = recv(rx->fd, buffer, size, MSG_TRUNC);
+        retval = recv(rx->fd, buffer->data, size, MSG_TRUNC);
 	    VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIuSIZE", MSG_TRUNC) = %"PRIdSIZE,
-		    netdev_rx_get_name(rx_), (uintptr_t)buffer, size, retval);
+		    netdev_rx_get_name(rx_), (uintptr_t)buffer->data, size, retval);
         if (retval >= 0) {
-	    netdev->stats.rx_packets++;
-	    netdev->stats.rx_bytes += retval;
+	        netdev->stats.rx_packets++;
+	        netdev->stats.rx_bytes += retval;
             if (retval <= size) {
 	    	    return retval;
             } else {
@@ -614,13 +615,11 @@ const struct netdev_class netdev_tunnel_class = {
     NULL,                       /* get_in6 */
     NULL,                       /* add_router */
     NULL,                       /* get_next_hop */
-    NULL,                       /* get_drv_info */
+    NULL,                       /* get_status */
     NULL,                       /* arp_lookup */
 
     netdev_tunnel_update_flags,
 
-    netdev_tunnel_change_seq,
-
     netdev_tunnel_rx_alloc,
     netdev_tunnel_rx_construct,
     netdev_tunnel_rx_destruct,