From c96f44b2e6bda16e1c68cc9a83eab513f6bead39 Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Sat, 22 Sep 2018 18:48:26 +0200 Subject: [PATCH] station: Make station_create/station_free static These two functions don't need to be used from outside of station.c anymore so make them static and simplify the station_create arguments slightly. --- src/station.c | 8 ++++---- src/station.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/station.c b/src/station.c index d2d0025c..027b7002 100644 --- a/src/station.c +++ b/src/station.c @@ -2214,7 +2214,7 @@ struct station *station_find(uint32_t ifindex) return NULL; } -struct station *station_create(struct wiphy *wiphy, struct netdev *netdev) +static struct station *station_create(struct netdev *netdev) { struct station *station; struct l_dbus *dbus = dbus_get_bus(); @@ -2229,7 +2229,7 @@ struct station *station_create(struct wiphy *wiphy, struct netdev *netdev) (l_hashmap_compare_func_t) strcmp); station->networks_sorted = l_queue_new(); - station->wiphy = wiphy; + station->wiphy = netdev_get_wiphy(netdev); station->netdev = netdev; l_queue_push_head(station_list, station); @@ -2242,7 +2242,7 @@ struct station *station_create(struct wiphy *wiphy, struct netdev *netdev) return station; } -void station_free(struct station *station) +static void station_free(struct station *station) { l_debug(""); @@ -2332,7 +2332,7 @@ static void station_netdev_watch(struct netdev *netdev, case NETDEV_WATCH_EVENT_NEW: if (netdev_get_iftype(netdev) == NETDEV_IFTYPE_STATION && netdev_get_is_up(netdev)) - station_create(netdev_get_wiphy(netdev), netdev); + station_create(netdev); break; case NETDEV_WATCH_EVENT_DOWN: case NETDEV_WATCH_EVENT_DEL: diff --git a/src/station.h b/src/station.h index 3a72f890..b8b19917 100644 --- a/src/station.h +++ b/src/station.h @@ -75,5 +75,3 @@ int station_disconnect(struct station *station); struct station *station_find(uint32_t ifindex); void station_foreach(station_foreach_func_t func, void *user_data); -struct station *station_create(struct wiphy *wiphy, struct netdev *netdev); -void station_free(struct station *station);