Re: [PATCH 02/23] cfg80211: Advertise ciphers via WE according to driver capability

Julian Calaby
2009-06-18T23:39:11Z

On Fri, Jun 19, 2009 at 08:21, David Kilroy<kilroyd@googlemail.com> wrote:
> Signed-off-by: David Kilroy <kilroyd@googlemail.com>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
> ---
>  net/wireless/wext-compat.c |   15 +++++++++++++--
>  1 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
> index 9e56f35..7dbe6c6 100644
> --- a/net/wireless/wext-compat.c
> +++ b/net/wireless/wext-compat.c
> @@ -204,8 +204,19 @@ int cfg80211_wext_giwrange(struct net_device *dev,
>        range->avg_qual.noise = range->max_qual.noise / 2;
>        range->avg_qual.updated = range->max_qual.updated;
>
> -       range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
> -                         IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
> +       range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2;

Should this should go into the for loop too, like how patch 5 works?

> +       for (c = 0; c < wdev->wiphy->n_cipher_suites; c++) {
> +               switch (wdev->wiphy->cipher_suites[c]) {
> +               case WLAN_CIPHER_SUITE_TKIP:
> +                       range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP;
> +                       break;
> +
> +               case WLAN_CIPHER_SUITE_CCMP:
> +                       range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;
> +                       break;
> +               }
> +       }
>
>        for (band = 0; band < IEEE80211_NUM_BANDS; band ++) {
>                int i;

Thanks,

--

Julian Calaby

Email: julian.calaby@gmail.com
.Plan: http://sites.google.com/site/juliancalaby/