lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/6] staging: ks7010: Factor out repeated code.
    Date
    Some of the code for reading IEs is replicated multiple times in the
    switch statement for get_ap_information(). Factor that code out into
    read_ie().

    Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
    ---
    drivers/staging/ks7010/ks_hostif.c | 48 +++++++++++++++++---------------------
    1 file changed, 22 insertions(+), 26 deletions(-)

    diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
    index 05f7be4638fe..a946ce76f899 100644
    --- a/drivers/staging/ks7010/ks_hostif.c
    +++ b/drivers/staging/ks7010/ks_hostif.c
    @@ -223,6 +223,21 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
    return 0;
    }

    +static u8 read_ie(unsigned char *bp, u8 max, u8 *body, char *name)
    +{
    + u8 size;
    +
    + if (*(bp + 1) <= max) {
    + size = *(bp + 1);
    + } else {
    + DPRINTK(1, "size over :: %s size=%d\n", name, *(bp + 1));
    + size = max;
    + }
    +
    + memcpy(body, bp + 2, size);
    + return size;
    +}
    +
    static
    int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
    struct local_ap_t *ap)
    @@ -253,14 +268,8 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
    while (bsize > offset) {
    switch (*bp) { /* Information Element ID */
    case WLAN_EID_SSID:
    - if (*(bp + 1) <= IEEE80211_MAX_SSID_LEN) {
    - ap->ssid.size = *(bp + 1);
    - } else {
    - DPRINTK(1, "size over :: ssid size=%d\n",
    - *(bp + 1));
    - ap->ssid.size = IEEE80211_MAX_SSID_LEN;
    - }
    - memcpy(ap->ssid.body, bp + 2, ap->ssid.size);
    + ap->ssid.size = read_ie(bp, IEEE80211_MAX_SSID_LEN,
    + ap->ssid.body, "ssid");
    break;
    case WLAN_EID_SUPP_RATES:
    case WLAN_EID_EXT_SUPP_RATES:
    @@ -283,28 +292,15 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
    break;
    case WLAN_EID_RSN:
    ap->rsn_ie.id = *bp;
    - if (*(bp + 1) <= RSN_IE_BODY_MAX) {
    - ap->rsn_ie.size = *(bp + 1);
    - } else {
    - DPRINTK(1, "size over :: rsn size=%d\n",
    - *(bp + 1));
    - ap->rsn_ie.size = RSN_IE_BODY_MAX;
    - }
    - memcpy(ap->rsn_ie.body, bp + 2, ap->rsn_ie.size);
    + ap->rsn_ie.size = read_ie(bp, RSN_IE_BODY_MAX,
    + ap->rsn_ie.body, "rsn");
    break;
    case WLAN_EID_VENDOR_SPECIFIC: /* WPA */
    if (memcmp(bp + 2, CIPHER_ID_WPA_WEP40, 4) == 0) { /* WPA OUI check */
    ap->wpa_ie.id = *bp;
    - if (*(bp + 1) <= RSN_IE_BODY_MAX) {
    - ap->wpa_ie.size = *(bp + 1);
    - } else {
    - DPRINTK(1,
    - "size over :: wpa size=%d\n",
    - *(bp + 1));
    - ap->wpa_ie.size = RSN_IE_BODY_MAX;
    - }
    - memcpy(ap->wpa_ie.body, bp + 2,
    - ap->wpa_ie.size);
    + ap->wpa_ie.size = read_ie(bp, RSN_IE_BODY_MAX,
    + ap->wpa_ie.body,
    + "wpa");
    }
    break;

    --
    2.16.2
    \
     
     \ /
      Last update: 2018-03-16 07:28    [W:5.418 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site