ofproto: Move bond files to ofproto

Relocating bond.[ch] to allow bond.c to make ofproto calls.
This is needed for upcoming patches that enable megaflow support
for bond ports.

Signed-off-by: Andy Zhou <azhou@nicira.com>

diff --git a/PORTING b/PORTING
index 53c19d3..88694a4 100644 (file)
--- a/PORTING
+++ b/PORTING
@@ -18,7 +18,7 @@ is a concordance, indexed by the area of the source tree:
         datapath/       vport           ---
         vswitchd/       iface           port
         ofproto/        port            bundle
-        lib/bond.c      slave           bond
+        ofproto/bond.c  slave           bond
         lib/lacp.c      slave           lacp
         lib/netdev.c    netdev          ---
         database        Interface       Port

diff --git a/lib/automake.mk b/lib/automake.mk
index 8fdc162..fadc4be 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -17,8 +17,6 @@ lib_libopenvswitch_a_SOURCES = \
        lib/bfd.h \
        lib/bitmap.c \
        lib/bitmap.h \
-       lib/bond.c \
-       lib/bond.h \
        lib/bundle.c \
        lib/bundle.h \
        lib/byte-order.h \

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index 432f083..218a5b1 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -7,6 +7,8 @@
 
 noinst_LIBRARIES += ofproto/libofproto.a
 ofproto_libofproto_a_SOURCES = \
+       ofproto/bond.c \
+       ofproto/bond.h \
        ofproto/collectors.c \
        ofproto/collectors.h \
        ofproto/connmgr.c \

diff --git a/lib/bond.c b/ofproto/bond.c
similarity index 100%
rename from lib/bond.c
rename to ofproto/bond.c

diff --git a/lib/bond.h b/ofproto/bond.h
similarity index 100%
rename from lib/bond.h
rename to ofproto/bond.h

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 0f4cf2c..c2307be 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -21,7 +21,6 @@
 #include "async-append.h"
 #include "bfd.h"
 #include "bitmap.h"
-#include "bond.h"
 #include "cfm.h"
 #include "coverage.h"
 #include "daemon.h"
@@ -39,6 +38,7 @@
 #include "ofp-print.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
+#include "ofproto/bond.h"
 #include "ofproto/ofproto.h"
 #include "poll-loop.h"
 #include "sha1.h"