From 350acc354d1ee9f7f485bb1a6e8d47b0a354f660 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 6 Dec 2014 15:17:30 +0200 Subject: [PATCH] nl80211: Move nl80211_set_iface_id() next its only remaining user This function was in a bit strange location between struct family_data and family_handler() definitions. Signed-off-by: Jouni Malinen --- src/drivers/driver_nl80211.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 8f7ff51d7..f1a99df1e 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -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; -- 2.39.5