vswitchd: Make the MAC entry aging time configurable.

[sliver-openvswitch.git] / ofproto / ofproto.c

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 24958c4..37e2ad9 100644 (file)
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
  * Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -515,7 +515,7 @@ ofproto_create(const char *datapath, const char *datapath_type,
     } else {
         p->ofhooks = &default_ofhooks;
         p->aux = p;
-        p->ml = mac_learning_create();
+        p->ml = mac_learning_create(MAC_ENTRY_DEFAULT_IDLE_TIME);
     }
 
     /* Pick final datapath ID. */
@@ -1681,6 +1681,9 @@ ofport_modified(struct ofproto *ofproto, struct ofport *port,
     port->opp.supported = opp->supported;
     port->opp.peer = opp->peer;
 
+    netdev_monitor_remove(ofproto->netdev_monitor, port->netdev);
+    netdev_monitor_add(ofproto->netdev_monitor, netdev);
+
     netdev_close(port->netdev);
     port->netdev = netdev;