From 9a54394ac99e955cf23d8b45cc75ae08316a50f8 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 6 Dec 2013 13:27:26 -0800 Subject: [PATCH] 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 --- PORTING | 2 +- lib/automake.mk | 2 -- ofproto/automake.mk | 2 ++ {lib => ofproto}/bond.c | 0 {lib => ofproto}/bond.h | 0 vswitchd/bridge.c | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename {lib => ofproto}/bond.c (100%) rename {lib => ofproto}/bond.h (100%) diff --git a/PORTING b/PORTING index 53c19d33d..88694a4c0 100644 --- 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 8fdc1628a..fadc4bed5 100644 --- 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 432f08371..218a5b123 100644 --- 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 0f4cf2c2e..c2307be1d 100644 --- 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" -- 2.43.0