From: Ben Pfaff <blp@nicira.com>
Date: Fri, 12 Jun 2009 22:18:52 +0000 (-0700)
Subject: vconn: Drop obsolete code for Netlink-based vconns.
X-Git-Tag: v0.90.1~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5fe577ebbec3cbcc6f77d966ed04f099b40a0d0b;p=sliver-openvswitch.git

vconn: Drop obsolete code for Netlink-based vconns.

Older versions of Open vSwitch implemented OpenFlow in the kernel over
a Netlink channel, and this code was here to work around some issues with
that, but now it is unnecessary since the OpenFlow kernel implementation is
gone.
---

diff --git a/lib/vconn.c b/lib/vconn.c
index 3c4efdbad..b4840512f 100644
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -433,10 +433,7 @@ vconn_recv(struct vconn *vconn, struct ofpbuf **msgp)
 static int
 do_recv(struct vconn *vconn, struct ofpbuf **msgp)
 {
-    int retval;
-
-again:
-    retval = (vconn->class->recv)(vconn, msgp);
+    int retval = (vconn->class->recv)(vconn, msgp);
     if (!retval) {
         struct ofp_header *oh;
 
@@ -456,20 +453,6 @@ again:
             && oh->type != OFPT_VENDOR)
         {
             if (vconn->version < 0) {
-                if (oh->type == OFPT_PACKET_IN
-                    || oh->type == OFPT_FLOW_EXPIRED
-                    || oh->type == OFPT_PORT_STATUS) {
-                    /* The kernel datapath is stateless and doesn't really
-                     * support version negotiation, so it can end up sending
-                     * these asynchronous message before version negotiation
-                     * is complete.  Just ignore them.
-                     *
-                     * (After we move OFPT_PORT_STATUS messages from the kernel
-                     * into secchan, we won't get those here, since secchan
-                     * does proper version negotiation.) */
-                    ofpbuf_delete(*msgp);
-                    goto again;
-                }
                 VLOG_ERR_RL(&bad_ofmsg_rl,
                             "%s: received OpenFlow message type %"PRIu8" "
                             "before version negotiation complete",