Return-path: Received: from mail-gy0-f174.google.com ([209.85.160.174]:56028 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751383Ab1JLC3X (ORCPT ); Tue, 11 Oct 2011 22:29:23 -0400 Received: by gyb13 with SMTP id 13so222591gyb.19 for ; Tue, 11 Oct 2011 19:29:22 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: Chaoming Li , linux-wireless@vger.kernel.org, Larry Finger Subject: [PATCH 2/5 V2] rtlwifi: Update to new Realtek version - Part I Date: Tue, 11 Oct 2011 21:28:48 -0500 Message-Id: <1318386531-5859-3-git-send-email-Larry.Finger@lwfinger.net> (sfid-20111012_042932_759378_82A81699) In-Reply-To: <1318386531-5859-1-git-send-email-Larry.Finger@lwfinger.net> References: <1318386531-5859-1-git-send-email-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Chaoming Li This patch incorporate the differences between the 06/20/2011 and 08/16/2011 Realtek releases of the rtlwifi driver. The changes include: 1. Handling of IEEE80211_HW_CONNECTION_MONITOR. 2. Fix typo to get proper response to nullfunc frames. Signed-off-by: Chaoming Li Signed-off-by: Larry Finger --- drivers/net/wireless/rtlwifi/base.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index eafe980..a2704fb 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c @@ -311,6 +311,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) IEEE80211_HW_RX_INCLUDES_FCS | IEEE80211_HW_BEACON_FILTER | IEEE80211_HW_AMPDU_AGGREGATION | + IEEE80211_HW_CONNECTION_MONITOR | + /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */ IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0; /* swlps or hwlps has been set in diff chip in init_sw_vars */ @@ -850,7 +852,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw, *So tcb_desc->hw_rate is just used for *special data and mgt frames */ - if (info->control.rates[0].idx == 0 && + if (info->control.rates[0].idx == 0 || ieee80211_is_nullfunc(fc)) { tcb_desc->use_driver_rate = true; tcb_desc->ratr_index = RATR_INX_WIRELESS_MC; @@ -1138,7 +1140,7 @@ void rtl_watchdog_wq_callback(void *data) } /* - *<3> to check if traffic busy, if + *<2> to check if traffic busy, if * busytraffic we don't change channel */ if (mac->link_state >= MAC80211_LINKED) { -- 1.7.6.4