From 2d0ca5a02cb87b2b317f097295628f805ed8ff23 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 21 Jan 2010 11:47:59 -0800 Subject: [PATCH] --- yaml --- r: 183935 b: refs/heads/master c: 7ae810776a51dc4dc6580013b0f6ba0f34d2b165 h: refs/heads/master i: 183933: f01a5bf3aa12ca52d904bdaf1ad00d45b6bbfdf9 183931: 2e037069bea9a44d9bf823d89ce674aece53cf3a 183927: 81ab62730e9d8439737a9a8c3fa1b9150512d08c 183919: b17cbc76a788792207c9bed3ac10fda49f69ece1 183903: c864ec11067d1baa75eb6d9044764557d028786b 183871: 879405041ba5cdaffedb5ec361a329b46ad653ec 183807: 6a6d42cbfa243a5e0ffb5d1736a5690264d7eb5a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2313231d5932..4e01b893a127 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71d75cf9ab858b99d072fece9784ab338af8e388 +refs/heads/master: 7ae810776a51dc4dc6580013b0f6ba0f34d2b165 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.h index 2f0094a43261..e71923961e69 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.h @@ -191,7 +191,7 @@ enum { IWL_RATE_2M_MASK) #define IWL_CCK_RATES_MASK \ - (IWL_BASIC_RATES_MASK | \ + (IWL_CCK_BASIC_RATES_MASK | \ IWL_RATE_5M_MASK | \ IWL_RATE_11M_MASK)