From fba5ada1a126a9922765c6d6b911df39749dabf4 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Tue, 19 Jul 2016 18:03:21 -0500
Subject: [PATCH] netdev: Make enum naming consistent with guidelines

---
 src/device.c | 15 +++++++++++----
 src/netdev.c |  5 +++--
 src/netdev.h |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/device.c b/src/device.c
index d57d0157..205b16b3 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1031,14 +1031,16 @@ static void device_netdev_notify(struct netdev *netdev,
 	struct device *device = user_data;
 	struct l_dbus *dbus = dbus_get_bus();
 
-	if (event == NETDEV_EVENT_UP) {
+	switch (event) {
+	case NETDEV_WATCH_EVENT_UP:
 		device_enter_state(device, DEVICE_STATE_AUTOCONNECT);
 
 		__device_watch_call_added(device);
 
 		l_dbus_property_changed(dbus, device_get_path(device),
 					IWD_DEVICE_INTERFACE, "Powered");
-	} else if (event == NETDEV_EVENT_DOWN) {
+		break;
+	case NETDEV_WATCH_EVENT_DOWN:
 		device_enter_state(device, DEVICE_STATE_OFF);
 
 		if (device->scan_pending)
@@ -1079,9 +1081,12 @@ static void device_netdev_notify(struct netdev *netdev,
 
 		l_dbus_property_changed(dbus, device_get_path(device),
 					IWD_DEVICE_INTERFACE, "Powered");
-	} else if (event == NETDEV_EVENT_NAME_CHANGE)
+		break;
+	case NETDEV_WATCH_EVENT_NAME_CHANGE:
 		l_dbus_property_changed(dbus, device_get_path(device),
 					IWD_DEVICE_INTERFACE, "Name");
+		break;
+	}
 }
 
 struct device *device_create(struct wiphy *wiphy, struct netdev *netdev)
@@ -1110,7 +1115,9 @@ struct device *device_create(struct wiphy *wiphy, struct netdev *netdev)
 	scan_ifindex_add(device->index);
 
 	device_netdev_notify(netdev, netdev_get_is_up(netdev) ?
-				NETDEV_EVENT_UP : NETDEV_EVENT_DOWN, device);
+						NETDEV_WATCH_EVENT_UP :
+						NETDEV_WATCH_EVENT_DOWN,
+						device);
 	device->netdev_watch_id =
 		netdev_watch_add(netdev, device_netdev_notify, device);
 
diff --git a/src/netdev.c b/src/netdev.c
index d88db9a6..e10a48f2 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -1231,14 +1231,15 @@ static void netdev_newlink_notify(const struct ifinfomsg *ifi, int bytes)
 
 	if (old_up != new_up) {
 		event.netdev = netdev;
-		event.type = new_up ? NETDEV_EVENT_UP : NETDEV_EVENT_DOWN;
+		event.type = new_up ? NETDEV_WATCH_EVENT_UP :
+						NETDEV_WATCH_EVENT_DOWN;
 
 		l_queue_foreach(netdev->watches, netdev_watch_notify, &event);
 	}
 
 	if (strcmp(old_name, netdev->name)) {
 		event.netdev = netdev;
-		event.type = NETDEV_EVENT_NAME_CHANGE;
+		event.type = NETDEV_WATCH_EVENT_NAME_CHANGE;
 
 		l_queue_foreach(netdev->watches, netdev_watch_notify, &event);
 	}
diff --git a/src/netdev.h b/src/netdev.h
index ccc2c997..a447b6a9 100644
--- a/src/netdev.h
+++ b/src/netdev.h
@@ -44,9 +44,9 @@ enum netdev_event {
 };
 
 enum netdev_watch_event {
-	NETDEV_EVENT_UP,
-	NETDEV_EVENT_DOWN,
-	NETDEV_EVENT_NAME_CHANGE,
+	NETDEV_WATCH_EVENT_UP,
+	NETDEV_WATCH_EVENT_DOWN,
+	NETDEV_WATCH_EVENT_NAME_CHANGE,
 };
 
 typedef void (*netdev_command_func_t) (bool result, void *user_data);