From 0ee22af32d5ad3667415d7e3b4ac29073bd37968 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sat, 2 Jan 2016 13:16:56 +0000
Subject: [PATCH] refactor: further simplify fastdp initialisation

---
 prog/weaver/main.go |  6 +-----
 router/fastdp.go    | 17 +++++------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index 68a257aa..a1a81a8c 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -169,11 +169,7 @@ func main() {
 		// options can override that below.  Even if both
 		// things are overridden, we might need bridging on
 		// the datapath.
-		fastdp, err := weave.NewFastDatapath(weave.FastDatapathConfig{
-			DatapathName: datapathName,
-			Port:         config.Port,
-		})
-
+		fastdp, err := weave.NewFastDatapath(datapathName, config.Port)
 		checkFatal(err)
 		networkConfig.Bridge = fastdp.Bridge()
 		overlays.Add("fastdp", fastdp.Overlay())
diff --git a/router/fastdp.go b/router/fastdp.go
index c23f1a38..3726ef50 100644
--- a/router/fastdp.go
+++ b/router/fastdp.go
@@ -68,14 +68,7 @@ type FastDatapath struct {
 	forwarders map[mesh.PeerName]*fastDatapathForwarder
 }
 
-type FastDatapathConfig struct {
-	DatapathName        string
-	Port                int
-	ExpireFlowsInterval time.Duration
-	ExpireMACsInterval  time.Duration
-}
-
-func NewFastDatapath(config FastDatapathConfig) (*FastDatapath, error) {
+func NewFastDatapath(dpName string, port int) (*FastDatapath, error) {
 	dpif, err := odp.NewDpif()
 	if err != nil {
 		return nil, err
@@ -88,18 +81,18 @@ func NewFastDatapath(config FastDatapathConfig) (*FastDatapath, error) {
 		}
 	}()
 
-	dp, err := dpif.LookupDatapath(config.DatapathName)
+	dp, err := dpif.LookupDatapath(dpName)
 	if err != nil {
 		return nil, err
 	}
 
-	iface, err := net.InterfaceByName(config.DatapathName)
+	iface, err := net.InterfaceByName(dpName)
 	if err != nil {
 		return nil, err
 	}
 
 	fastdp := &FastDatapath{
-		dpname:        config.DatapathName,
+		dpname:        dpName,
 		mtu:           iface.MTU,
 		dpif:          dpif,
 		dp:            dp,
@@ -131,7 +124,7 @@ func NewFastDatapath(config FastDatapathConfig) (*FastDatapath, error) {
 	// numbers to be independent, but working out how to specify
 	// them on the connecting side.  So we can wait to find out if
 	// anyone wants that.
-	fastdp.mainVxlanVportID, err = fastdp.getVxlanVportIDHarder(config.Port+1, 5, time.Millisecond*10)
+	fastdp.mainVxlanVportID, err = fastdp.getVxlanVportIDHarder(port+1, 5, time.Millisecond*10)
 	if err != nil {
 		return nil, err
 	}