]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
nl80211: Move nl80211_set_iface_id() next its only remaining user
authorJouni Malinen <j@w1.fi>
Sat, 6 Dec 2014 13:17:30 +0000 (15:17 +0200)
committerJouni Malinen <j@w1.fi>
Sat, 6 Dec 2014 14:41:26 +0000 (16:41 +0200)
This function was in a bit strange location between struct family_data
and family_handler() definitions.

Signed-off-by: Jouni Malinen <j@w1.fi>
src/drivers/driver_nl80211.c

index 8f7ff51d78d0ae9cf068d9e81cc0232d88b0d831..f1a99df1ee6180e076e14f29584eb5931becce93 100644 (file)
@@ -368,14 +368,6 @@ struct family_data {
 };
 
 
-static int nl80211_set_iface_id(struct nl_msg *msg, struct i802_bss *bss)
-{
-       if (bss->wdev_id_set)
-               return nla_put_u64(msg, NL80211_ATTR_WDEV, bss->wdev_id);
-       return nla_put_u32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
-}
-
-
 static int family_handler(struct nl_msg *msg, void *arg)
 {
        struct family_data *res = arg;
@@ -439,6 +431,14 @@ void * nl80211_cmd(struct wpa_driver_nl80211_data *drv,
 }
 
 
+static int nl80211_set_iface_id(struct nl_msg *msg, struct i802_bss *bss)
+{
+       if (bss->wdev_id_set)
+               return nla_put_u64(msg, NL80211_ATTR_WDEV, bss->wdev_id);
+       return nla_put_u32(msg, NL80211_ATTR_IFINDEX, bss->ifindex);
+}
+
+
 struct nl_msg * nl80211_cmd_msg(struct i802_bss *bss, int flags, uint8_t cmd)
 {
        struct nl_msg *msg;