X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Flearning-switch.c;h=64639f2c829a38324608113d55438e26bc320035;hb=bfb1f2d5cbb9ef82f2def2f41f5ff8a8f02b5bbc;hp=092274cb57dcc365eed6b47e517858576d21abc7;hpb=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=openvswitch

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 092274cb..64639f2c 100644
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -220,13 +220,7 @@ lswitch_run(struct lswitch *sw, struct rconn *rconn)
 static void
 wait_timeout(long long int started)
 {
-    long long int now = time_msec();
-    long long int timeout = 10000 - (now - started);
-    if (timeout <= 0) {
-        poll_immediate_wake();
-    } else {
-        poll_timer_wait(timeout);
-    }
+    poll_timer_wait_until(started + 10000);
 }
 
 void
@@ -404,7 +398,7 @@ process_packet_in(struct lswitch *sw, struct rconn *rconn, void *opi_)
     pkt_len = ntohs(opi->header.length) - pkt_ofs;
     pkt.data = opi->data;
     pkt.size = pkt_len;
-    flow_extract(&pkt, in_port, &flow);
+    flow_extract(&pkt, 0, in_port, &flow);
 
     if (may_learn(sw, in_port) && sw->ml) {
         if (mac_learning_learn(sw->ml, flow.dl_src, 0, in_port)) {