Hi Daniel,
On 11 dec. 2012, at 11:04, Daniel Golle <dgolle@xxxxxxxxx> wrote:
>
> Signed-off-by: Daniel Golle <dgolle@xxxxxxxxx>
Again we need a proper patch description here.
Also, can you explain why the enabling / disabling of individual bands needs to be done via platform data, as opposed to letting user space handle this?
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 355cff5..c67e769 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -426,6 +426,7 @@ struct hw_mode_spec {
> unsigned int supported_bands;
> #define SUPPORT_BAND_2GHZ 0x00000001
> #define SUPPORT_BAND_5GHZ 0x00000002
> +#define SUPPORT_BAND_BOTH (SUPPORT_BAND_2GHZ | SUPPORT_BAND_5GHZ)
>
> unsigned int supported_rates;
> #define SUPPORT_RATE_CCK 0x00000001
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index d454488..b7856bf 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -835,6 +835,22 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
> unsigned int num_rates;
> unsigned int i;
>
> + if (rt2x00dev->dev->platform_data) {
> + struct rt2x00_platform_data *pdata;
> +
> + pdata = rt2x00dev->dev->platform_data;
> + if (pdata->disable_2ghz)
> + spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
> + if (pdata->disable_5ghz)
> + spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
> + }
> +
> + if ((spec->supported_bands & SUPPORT_BAND_BOTH) == 0) {
> + ERROR(rt2x00dev, "No supported bands\n");
> + return -EINVAL;
> + }
> +
> +
> num_rates = 0;
> if (spec->supported_rates & SUPPORT_RATE_CCK)
> num_rates += 4;
> diff --git a/include/linux/rt2x00_platform.h b/include/linux/rt2x00_platform.h
> index 80effa7..b4c7768 100644
> --- a/include/linux/rt2x00_platform.h
> +++ b/include/linux/rt2x00_platform.h
> @@ -14,6 +14,9 @@
>
> struct rt2x00_platform_data {
> char *eeprom_file_name;
> +
> + int disable_2ghz;
> + int disable_5ghz;
> };
>
> #endif /* _RT2X00_PLATFORM_H */
> --
> 1.8.0.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
