diff mbox

[ovs-dev,1/2] netdev: Refactor destruction of netdev_ports.

Message ID 20170627181310.2911-1-joe@ovn.org
State Superseded
Headers show

Commit Message

Joe Stringer June 27, 2017, 6:13 p.m. UTC 
An upcoming patch will reuse this from elsewhere.

Signed-off-by: Joe Stringer <joe@ovn.org>
---
 lib/netdev.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Comments

Ben Pfaff Aug. 2, 2017, 8:29 p.m. UTC | #1 
On Tue, Jun 27, 2017 at 11:13:09AM -0700, Joe Stringer wrote:
> An upcoming patch will reuse this from elsewhere.
> 
> Signed-off-by: Joe Stringer <joe@ovn.org>

I see that Darrell reviewed patch 2, but it's not clear to me whether
this patch series is properly reviewed.  Do you want me to look at it?
(Sorry about the delay!)
diff mbox

Patch

diff --git a/lib/netdev.c b/lib/netdev.c
index 765bf4b9ccad..eb7aef7376f1 100644
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -2218,6 +2218,15 @@  netdev_ports_get(odp_port_t port_no, const void *obj)
     return ret;
 }
 
+static void
+netdev_port_data_destroy(struct port_to_netdev_data *data)
+{
+    dpif_port_destroy(&data->dpif_port);
+    netdev_close(data->netdev); /* unref and possibly close */
+    hmap_remove(&port_to_netdev, &data->node);
+    free(data);
+}
+
 int
 netdev_ports_remove(odp_port_t port_no, const void *obj)
 {
@@ -2229,10 +2238,7 @@  netdev_ports_remove(odp_port_t port_no, const void *obj)
     data = netdev_ports_lookup(port_no, obj);
 
     if (data) {
-        dpif_port_destroy(&data->dpif_port);
-        netdev_close(data->netdev); /* unref and possibly close */
-        hmap_remove(&port_to_netdev, &data->node);
-        free(data);
+        netdev_port_data_destroy(data);
         ret = 0;
     }