diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2015-07-17 16:55:08 +0300 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:19:46 -0600 |
| commit | ef99baecda4677069a63a1713456bf0c92ebc762 (patch) | |
| tree | faecea48588ca2006575ae08fe2369a5f7a6a856 /src/fst | |
| parent | 6e11299dea361b928318e9c0e0048734807824c9 (diff) | |
| download | android_external_wpa_supplicant_8-ef99baecda4677069a63a1713456bf0c92ebc762.tar.gz android_external_wpa_supplicant_8-ef99baecda4677069a63a1713456bf0c92ebc762.tar.bz2 android_external_wpa_supplicant_8-ef99baecda4677069a63a1713456bf0c92ebc762.zip | |
FST: Move fst_mbie_get_peer_addr() into fst_group.c
There is no need for this function to be an inline function in a header
file since it is used only within fst_group.c.
Change-Id: I98aa9b5f735a721b6f86858762b21b23a4918467
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 2bb51eddad7d877566e42a17368f2767b3aab0a0
Git-repo: git://w1.fi/srv/git/hostap.git
CRs-Fixed: 891455
Diffstat (limited to 'src/fst')
| -rw-r--r-- | src/fst/fst_group.c | 21 | ||||
| -rw-r--r-- | src/fst/fst_internal.h | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/fst/fst_group.c b/src/fst/fst_group.c index 8e731375..3880f5e9 100644 --- a/src/fst/fst_group.c +++ b/src/fst/fst_group.c @@ -201,6 +201,27 @@ static struct wpabuf * fst_group_create_mb_ie(struct fst_group *g, } +static const u8 * fst_mbie_get_peer_addr(const struct multi_band_ie *mbie) +{ + const u8 *peer_addr = NULL; + + switch (MB_CTRL_ROLE(mbie->mb_ctrl)) { + case MB_STA_ROLE_AP: + peer_addr = mbie->bssid; + break; + case MB_STA_ROLE_NON_PCP_NON_AP: + if (mbie->mb_ctrl & MB_CTRL_STA_MAC_PRESENT && + IE_BUFFER_LENGTH(mbie->len) >= sizeof(*mbie) + ETH_ALEN) + peer_addr = (const u8 *) &mbie[1]; + break; + default: + break; + } + + return peer_addr; +} + + static struct fst_iface * fst_group_get_new_iface_by_mbie_and_band_id(struct fst_group *g, const u8 *mb_ies_buff, diff --git a/src/fst/fst_internal.h b/src/fst/fst_internal.h index 948c5568..8f7b1a7a 100644 --- a/src/fst/fst_internal.h +++ b/src/fst/fst_internal.h @@ -48,27 +48,6 @@ fst_hw_mode_to_band(enum hostapd_hw_mode mode) #define IE_HEADER_SIZE ((u8) (2 * sizeof(u8))) #define IE_BUFFER_LENGTH(ie_len_val) ((size_t) ((ie_len_val) + IE_HEADER_SIZE)) -static inline const u8 * -fst_mbie_get_peer_addr(const struct multi_band_ie *mbie) -{ - const u8 *peer_addr = NULL; - - switch (MB_CTRL_ROLE(mbie->mb_ctrl)) { - case MB_STA_ROLE_AP: - peer_addr = mbie->bssid; - break; - case MB_STA_ROLE_NON_PCP_NON_AP: - if (mbie->mb_ctrl & MB_CTRL_STA_MAC_PRESENT && - IE_BUFFER_LENGTH(mbie->len) >= sizeof(*mbie) + ETH_ALEN) - peer_addr = (const u8 *) &mbie[1]; - break; - default: - break; - } - - return peer_addr; -} - struct fst_ctrl_handle { struct fst_ctrl ctrl; struct dl_list global_ctrls_lentry; |