lkml.org 
[lkml]   [2015]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 11/34] staging: rtl8192e: Remove RTLLIB_DEBUG_SCAN()
    Date
    Use netdev_dbg() instead, remove duplicated logs.

    Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
    ---
    drivers/staging/rtl8192e/rtllib.h | 1 -
    drivers/staging/rtl8192e/rtllib_rx.c | 101 ++++++++++++++++-------------------
    drivers/staging/rtl8192e/rtllib_wx.c | 12 +++--
    3 files changed, 54 insertions(+), 60 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
    index 392bcd5..6481919 100644
    --- a/drivers/staging/rtl8192e/rtllib.h
    +++ b/drivers/staging/rtl8192e/rtllib.h
    @@ -703,7 +703,6 @@ do { \
    #define RTLLIB_DL_ERR (1<<31)
    #define RTLLIB_DEBUG_INFO(f, a...) RTLLIB_DEBUG(RTLLIB_DL_INFO, f, ## a)

    -#define RTLLIB_DEBUG_SCAN(f, a...) RTLLIB_DEBUG(RTLLIB_DL_SCAN, f, ## a)
    #define RTLLIB_DEBUG_STATE(f, a...) RTLLIB_DEBUG(RTLLIB_DL_STATE, f, ## a)
    #define RTLLIB_DEBUG_MGMT(f, a...) RTLLIB_DEBUG(RTLLIB_DL_MGMT, f, ## a)
    #define RTLLIB_DEBUG_FRAG(f, a...) RTLLIB_DEBUG(RTLLIB_DL_FRAG, f, ## a)
    diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
    index 304404d..a6dde35 100644
    --- a/drivers/staging/rtl8192e/rtllib_rx.c
    +++ b/drivers/staging/rtl8192e/rtllib_rx.c
    @@ -2130,8 +2130,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
    break;

    case MFIE_TYPE_HT_CAP:
    - RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_CAP: %d bytes\n",
    - info_element->len);
    + netdev_dbg(ieee->dev, "MFIE_TYPE_HT_CAP: %d bytes\n",
    + info_element->len);
    tmp_htcap_len = min_t(u8, info_element->len, MAX_IE_LEN);
    if (tmp_htcap_len != 0) {
    network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
    @@ -2157,8 +2157,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,


    case MFIE_TYPE_HT_INFO:
    - RTLLIB_DEBUG_SCAN("MFIE_TYPE_HT_INFO: %d bytes\n",
    - info_element->len);
    + netdev_dbg(ieee->dev, "MFIE_TYPE_HT_INFO: %d bytes\n",
    + info_element->len);
    tmp_htinfo_len = min_t(u8, info_element->len, MAX_IE_LEN);
    if (tmp_htinfo_len) {
    network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE;
    @@ -2173,8 +2173,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
    break;

    case MFIE_TYPE_AIRONET:
    - RTLLIB_DEBUG_SCAN("MFIE_TYPE_AIRONET: %d bytes\n",
    - info_element->len);
    + netdev_dbg(ieee->dev, "MFIE_TYPE_AIRONET: %d bytes\n",
    + info_element->len);
    if (info_element->len > IE_CISCO_FLAG_POSITION) {
    network->bWithAironetIE = true;

    @@ -2196,8 +2196,8 @@ int rtllib_parse_info_param(struct rtllib_device *ieee,
    break;

    case MFIE_TYPE_COUNTRY:
    - RTLLIB_DEBUG_SCAN("MFIE_TYPE_COUNTRY: %d bytes\n",
    - info_element->len);
    + netdev_dbg(ieee->dev, "MFIE_TYPE_COUNTRY: %d bytes\n",
    + info_element->len);
    rtllib_extract_country_ie(ieee, info_element, network,
    network->bssid);
    break;
    @@ -2304,10 +2304,9 @@ static inline int rtllib_network_init(
    }

    if (network->mode == 0) {
    - RTLLIB_DEBUG_SCAN("Filtered out '%s (%pM)' network.\n",
    - escape_essid(network->ssid,
    - network->ssid_len),
    - network->bssid);
    + netdev_dbg(ieee->dev, "Filtered out '%s (%pM)' network.\n",
    + escape_essid(network->ssid, network->ssid_len),
    + network->bssid);
    return 1;
    }

    @@ -2505,33 +2504,32 @@ static inline void rtllib_process_probe_response(
    if (!network)
    return;

    - RTLLIB_DEBUG_SCAN(
    - "'%s' ( %pM ): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
    - escape_essid(info_element->data, info_element->len),
    - beacon->header.addr3,
    - (le16_to_cpu(beacon->capability) & (1<<0xf)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0xe)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0xd)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0xc)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0xb)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0xa)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x9)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x8)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x7)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x6)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x5)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x4)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x3)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x2)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x1)) ? '1' : '0',
    - (le16_to_cpu(beacon->capability) & (1<<0x0)) ? '1' : '0');
    + netdev_dbg(ieee->dev,
    + "'%s' ( %pM ): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
    + escape_essid(info_element->data, info_element->len),
    + beacon->header.addr3,
    + (le16_to_cpu(beacon->capability) & (1<<0xf)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0xe)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0xd)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0xc)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0xb)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0xa)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x9)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x8)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x7)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x6)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x5)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x4)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x3)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x2)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x1)) ? '1' : '0',
    + (le16_to_cpu(beacon->capability) & (1<<0x0)) ? '1' : '0');

    if (rtllib_network_init(ieee, beacon, network, stats)) {
    - RTLLIB_DEBUG_SCAN("Dropped '%s' ( %pM) via %s.\n",
    - escape_essid(info_element->data,
    - info_element->len), beacon->header.addr3,
    - is_beacon(frame_ctl) ? "BEACON" :
    - "PROBE RESPONSE");
    + netdev_dbg(ieee->dev, "Dropped '%s' ( %pM) via %s.\n",
    + escape_essid(info_element->data, info_element->len),
    + beacon->header.addr3,
    + is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
    goto free_network;
    }

    @@ -2594,10 +2592,10 @@ static inline void rtllib_process_probe_response(
    /* If there are no more slots, expire the oldest */
    list_del(&oldest->list);
    target = oldest;
    - RTLLIB_DEBUG_SCAN("Expired '%s' ( %pM) from network list.\n",
    - escape_essid(target->ssid,
    - target->ssid_len),
    - target->bssid);
    + netdev_dbg(ieee->dev,
    + "Expired '%s' ( %pM) from network list.\n",
    + escape_essid(target->ssid, target->ssid_len),
    + target->bssid);
    } else {
    /* Otherwise just pull from the free list */
    target = list_entry(ieee->network_free_list.next,
    @@ -2605,22 +2603,20 @@ static inline void rtllib_process_probe_response(
    list_del(ieee->network_free_list.next);
    }

    + netdev_dbg(ieee->dev, "Adding '%s' ( %pM) via %s.\n",
    + escape_essid(network->ssid, network->ssid_len),
    + network->bssid,
    + is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");

    - RTLLIB_DEBUG_SCAN("Adding '%s' ( %pM) via %s.\n",
    - escape_essid(network->ssid,
    - network->ssid_len), network->bssid,
    - is_beacon(frame_ctl) ? "BEACON" :
    - "PROBE RESPONSE");
    memcpy(target, network, sizeof(*target));
    list_add_tail(&target->list, &ieee->network_list);
    if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)
    rtllib_softmac_new_net(ieee, network);
    } else {
    - RTLLIB_DEBUG_SCAN("Updating '%s' ( %pM) via %s.\n",
    - escape_essid(target->ssid, target->ssid_len),
    - target->bssid,
    - is_beacon(frame_ctl) ? "BEACON" :
    - "PROBE RESPONSE");
    + netdev_dbg(ieee->dev, "Updating '%s' ( %pM) via %s.\n",
    + escape_essid(target->ssid, target->ssid_len),
    + target->bssid,
    + is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");

    /* we have an entry and we are going to update it. But this
    * entry may be already expired. In this case we do the same
    @@ -2670,7 +2666,6 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
    case RTLLIB_STYPE_BEACON:
    RTLLIB_DEBUG_MGMT("received BEACON (%d)\n",
    WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)));
    - RTLLIB_DEBUG_SCAN("Beacon\n");
    rtllib_process_probe_response(
    ieee, (struct rtllib_probe_response *)header,
    stats);
    @@ -2685,7 +2680,6 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
    case RTLLIB_STYPE_PROBE_RESP:
    RTLLIB_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
    WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)));
    - RTLLIB_DEBUG_SCAN("Probe response\n");
    rtllib_process_probe_response(ieee,
    (struct rtllib_probe_response *)header, stats);
    break;
    @@ -2693,7 +2687,6 @@ void rtllib_rx_mgt(struct rtllib_device *ieee,
    RTLLIB_DEBUG_MGMT("received PROBE RESQUEST (%d)\n",
    WLAN_FC_GET_STYPE(
    le16_to_cpu(header->frame_ctl)));
    - RTLLIB_DEBUG_SCAN("Probe request\n");
    if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
    ((ieee->iw_mode == IW_MODE_ADHOC ||
    ieee->iw_mode == IW_MODE_MASTER) &&
    diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
    index c2c5f0d..2812a77 100644
    --- a/drivers/staging/rtl8192e/rtllib_wx.c
    +++ b/drivers/staging/rtl8192e/rtllib_wx.c
    @@ -281,11 +281,13 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee,
    ev = rtl819x_translate_scan(ieee, ev, stop, network,
    info);
    else
    - RTLLIB_DEBUG_SCAN("Not showing network '%s ( %pM)' due to age (%lums).\n",
    - escape_essid(network->ssid,
    - network->ssid_len),
    - network->bssid,
    - (jiffies - network->last_scanned) / (HZ / 100));
    + netdev_dbg(ieee->dev,
    + "Network '%s ( %pM)' hidden due to age (%lums).\n",
    + escape_essid(network->ssid,
    + network->ssid_len),
    + network->bssid,
    + (jiffies - network->last_scanned) /
    + (HZ / 100));
    }

    spin_unlock_irqrestore(&ieee->lock, flags);
    --
    1.8.4.1


    \
     
     \ /
      Last update: 2015-05-31 20:41    [W:4.620 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site