diff for duplicates of <20110603030746.GA4834@joana> diff --git a/a/1.txt b/N1/1.txt index e884c93..893ec40 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,25 +25,30 @@ Hi Greg, > - rate_idx -= IWL_FIRST_OFDM_RATE; > - /* 6M and 9M shared same MCS index */ > - rate_idx = (rate_idx > 0) ? (rate_idx - 1) : 0; -> - if (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >> - IWL_RATE_MIMO2_6M_PLCP) +> - if (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >= +> - IWL_RATE_MIMO2_6M_PLCP) > - rate_idx = rate_idx + MCS_INDEX_PER_STREAM; > - info->control.rates[0].flags = IEEE80211_TX_RC_MCS; > - if (lq_sta->last_rate_n_flags & RATE_MCS_SGI_MSK) -> - info->control.rates[0].flags |> - IEEE80211_TX_RC_SHORT_GI; +> - info->control.rates[0].flags |= +> - IEEE80211_TX_RC_SHORT_GI; > - if (lq_sta->last_rate_n_flags & RATE_MCS_DUP_MSK) -> - info->control.rates[0].flags |> - IEEE80211_TX_RC_DUP_DATA; +> - info->control.rates[0].flags |= +> - IEEE80211_TX_RC_DUP_DATA; > - if (lq_sta->last_rate_n_flags & RATE_MCS_HT40_MSK) -> - info->control.rates[0].flags |> - IEEE80211_TX_RC_40_MHZ_WIDTH; +> - info->control.rates[0].flags |= +> - IEEE80211_TX_RC_40_MHZ_WIDTH; > - if (lq_sta->last_rate_n_flags & RATE_MCS_GF_MSK) -> - info->control.rates[0].flags |> - IEEE80211_TX_RC_GREEN_FIELD; +> - info->control.rates[0].flags |= +> - IEEE80211_TX_RC_GREEN_FIELD; > - } else { > - /* Check for invalid rates */ > - if ((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT_LEGACY) || -> - ((sband->band = IEEE80211_BAND_5GHZ) && +> - ((sband->band == IEEE80211_BAND_5GHZ) && > - (rate_idx < IWL_FIRST_OFDM_RATE))) > - rate_idx = rate_lowest_index(sband, sta); > - /* On valid 5 GHz rate, adjust index */ -> - else if (sband->band = IEEE80211_BAND_5GHZ) +> - else if (sband->band == IEEE80211_BAND_5GHZ) > + if (lq_sta) { Then do diff --git a/a/content_digest b/N1/content_digest index b634e65..d23d813 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01307066770-27309-5-git-send-email-Gregory.Dietsche@cuw.edu\0" "From\0Gustavo F. Padovan <padovan@profusion.mobi>\0" "Subject\0Re: [PATCH 5/5] iwlegacy: add missing null check\0" - "Date\0Fri, 03 Jun 2011 03:07:46 +0000\0" + "Date\0Fri, 3 Jun 2011 00:07:46 -0300\0" "To\0Greg Dietsche <Gregory.Dietsche@cuw.edu>\0" "Cc\0sgruszka@redhat.com" linville@tuxdriver.com @@ -39,25 +39,30 @@ "> -\t\trate_idx -= IWL_FIRST_OFDM_RATE;\n" "> -\t\t/* 6M and 9M shared same MCS index */\n" "> -\t\trate_idx = (rate_idx > 0) ? (rate_idx - 1) : 0;\n" - "> -\t\tif (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >> -\t\t\t IWL_RATE_MIMO2_6M_PLCP)\n" + "> -\t\tif (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >=\n" + "> -\t\t\t IWL_RATE_MIMO2_6M_PLCP)\n" "> -\t\t\trate_idx = rate_idx + MCS_INDEX_PER_STREAM;\n" "> -\t\tinfo->control.rates[0].flags = IEEE80211_TX_RC_MCS;\n" "> -\t\tif (lq_sta->last_rate_n_flags & RATE_MCS_SGI_MSK)\n" - "> -\t\t\tinfo->control.rates[0].flags |> -\t\t\t\t\tIEEE80211_TX_RC_SHORT_GI;\n" + "> -\t\t\tinfo->control.rates[0].flags |=\n" + "> -\t\t\t\t\tIEEE80211_TX_RC_SHORT_GI;\n" "> -\t\tif (lq_sta->last_rate_n_flags & RATE_MCS_DUP_MSK)\n" - "> -\t\t\tinfo->control.rates[0].flags |> -\t\t\t\t\tIEEE80211_TX_RC_DUP_DATA;\n" + "> -\t\t\tinfo->control.rates[0].flags |=\n" + "> -\t\t\t\t\tIEEE80211_TX_RC_DUP_DATA;\n" "> -\t\tif (lq_sta->last_rate_n_flags & RATE_MCS_HT40_MSK)\n" - "> -\t\t\tinfo->control.rates[0].flags |> -\t\t\t\t\tIEEE80211_TX_RC_40_MHZ_WIDTH;\n" + "> -\t\t\tinfo->control.rates[0].flags |=\n" + "> -\t\t\t\t\tIEEE80211_TX_RC_40_MHZ_WIDTH;\n" "> -\t\tif (lq_sta->last_rate_n_flags & RATE_MCS_GF_MSK)\n" - "> -\t\t\tinfo->control.rates[0].flags |> -\t\t\t\t\tIEEE80211_TX_RC_GREEN_FIELD;\n" + "> -\t\t\tinfo->control.rates[0].flags |=\n" + "> -\t\t\t\t\tIEEE80211_TX_RC_GREEN_FIELD;\n" "> -\t} else {\n" "> -\t\t/* Check for invalid rates */\n" "> -\t\tif ((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT_LEGACY) ||\n" - "> -\t\t\t\t((sband->band = IEEE80211_BAND_5GHZ) &&\n" + "> -\t\t\t\t((sband->band == IEEE80211_BAND_5GHZ) &&\n" "> -\t\t\t\t (rate_idx < IWL_FIRST_OFDM_RATE)))\n" "> -\t\t\trate_idx = rate_lowest_index(sband, sta);\n" "> -\t\t/* On valid 5 GHz rate, adjust index */\n" - "> -\t\telse if (sband->band = IEEE80211_BAND_5GHZ)\n" + "> -\t\telse if (sband->band == IEEE80211_BAND_5GHZ)\n" "> +\tif (lq_sta) {\n" "\n" "Then do\n" @@ -70,4 +75,4 @@ "Gustavo F. Padovan\n" http://profusion.mobi -de4c74c93c44e9297fdf695772a28d9488aa17315bf07c1bc1b4c5f86e483505 +31875f079f9d0cbb4f4ff9d081440133d1f686ac859f28b89da9467a56f73410
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.