diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-07-17 16:59:09 +0300 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:19:47 -0600 |
| commit | d3ec4caaead7a64ea686f7909ca3aa4bfe7368cc (patch) | |
| tree | d8d8d66e9c64391157e8ed650fdbb7ebb9910913 /src/fst | |
| parent | ef99baecda4677069a63a1713456bf0c92ebc762 (diff) | |
| download | android_external_wpa_supplicant_8-d3ec4caaead7a64ea686f7909ca3aa4bfe7368cc.tar.gz android_external_wpa_supplicant_8-d3ec4caaead7a64ea686f7909ca3aa4bfe7368cc.tar.bz2 android_external_wpa_supplicant_8-d3ec4caaead7a64ea686f7909ca3aa4bfe7368cc.zip | |
FST: Clean up fst_group_update_ie()
None of the callers passed in cleaning_up == TRUE, so drop that unused
code path.
Change-Id: I38b1180e5de26dc9c3ce71da5f9c8005a1e14e86
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: f5f1cc93070bb91b3444191b20e13319135f0a9e
Git-repo: git://w1.fi/srv/git/hostap.git
CRs-Fixed: 891455
Diffstat (limited to 'src/fst')
| -rw-r--r-- | src/fst/fst.c | 8 | ||||
| -rw-r--r-- | src/fst/fst_group.c | 25 | ||||
| -rw-r--r-- | src/fst/fst_group.h | 2 |
3 files changed, 14 insertions, 21 deletions
diff --git a/src/fst/fst.c b/src/fst/fst.c index b70ef361..a6d0de9a 100644 --- a/src/fst/fst.c +++ b/src/fst/fst.c @@ -95,7 +95,7 @@ struct fst_iface * fst_attach(const char *ifname, const u8 *own_addr, } fst_group_attach_iface(group, iface); - fst_group_update_ie(group, FALSE); + fst_group_update_ie(group); foreach_fst_ctrl_call(on_iface_added, iface); @@ -117,7 +117,7 @@ void fst_detach(struct fst_iface *iface) foreach_fst_ctrl_call(on_iface_removed, iface); fst_group_detach_iface(group, iface); fst_iface_delete(iface); - fst_group_update_ie(group, FALSE); + fst_group_update_ie(group); fst_group_delete_if_empty(group); } @@ -194,7 +194,7 @@ void fst_notify_peer_connected(struct fst_iface *iface, const u8 *addr) return; #ifndef HOSTAPD - fst_group_update_ie(fst_iface_get_group(iface), FALSE); + fst_group_update_ie(fst_iface_get_group(iface)); #endif /* HOSTAPD */ fst_printf_iface(iface, MSG_DEBUG, MACSTR " became connected", @@ -210,7 +210,7 @@ void fst_notify_peer_disconnected(struct fst_iface *iface, const u8 *addr) return; #ifndef HOSTAPD - fst_group_update_ie(fst_iface_get_group(iface), FALSE); + fst_group_update_ie(fst_iface_get_group(iface)); #endif /* HOSTAPD */ fst_printf_iface(iface, MSG_DEBUG, MACSTR " became disconnected", diff --git a/src/fst/fst_group.c b/src/fst/fst_group.c index 3880f5e9..e362aa2d 100644 --- a/src/fst/fst_group.c +++ b/src/fst/fst_group.c @@ -444,25 +444,18 @@ Boolean fst_group_delete_if_empty(struct fst_group *group) } -void fst_group_update_ie(struct fst_group *g, Boolean cleaning_up) +void fst_group_update_ie(struct fst_group *g) { struct fst_iface *i; foreach_fst_group_iface(g, i) { - if (!cleaning_up) { - struct wpabuf *mbie = fst_group_create_mb_ie(g, i); - - if (!mbie) - fst_printf_iface(i, MSG_WARNING, - "cannot create MB IE"); - - fst_iface_attach_mbie(i, mbie); - fst_iface_set_ies(i, mbie); - fst_printf_iface(i, MSG_DEBUG, - "multi-band IE set to %p", mbie); - } else { - fst_iface_attach_mbie(i, NULL); - fst_iface_set_ies(i, NULL); - } + struct wpabuf *mbie = fst_group_create_mb_ie(g, i); + + if (!mbie) + fst_printf_iface(i, MSG_WARNING, "cannot create MB IE"); + + fst_iface_attach_mbie(i, mbie); + fst_iface_set_ies(i, mbie); + fst_printf_iface(i, MSG_DEBUG, "multi-band IE set to %p", mbie); } } diff --git a/src/fst/fst_group.h b/src/fst/fst_group.h index 4f33599d..9dcc6669 100644 --- a/src/fst/fst_group.h +++ b/src/fst/fst_group.h @@ -27,7 +27,7 @@ void fst_group_attach_iface(struct fst_group *g, struct fst_iface *i); void fst_group_detach_iface(struct fst_group *g, struct fst_iface *i); void fst_group_delete(struct fst_group *g); -void fst_group_update_ie(struct fst_group *g, Boolean cleaning_up); +void fst_group_update_ie(struct fst_group *g); static inline Boolean fst_group_has_ifaces(struct fst_group *g) { |