According to the documentation, the limit is 0x3f == 63, not 64.
Signed-off-by: Johannes Berg <[email protected]>
---
It seems bug 2018 is related to the link quality command, because it
seems I can trivially trigger it or similar bugs that way, but this
doesn't fix it.
--- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:33.804427206 +0200
+++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:38.924427592 +0200
@@ -1922,7 +1922,7 @@ struct iwl_link_qual_general_params {
#define LINK_QUAL_AGG_DISABLE_START_MIN (0)
#define LINK_QUAL_AGG_FRAME_LIMIT_DEF (31)
-#define LINK_QUAL_AGG_FRAME_LIMIT_MAX (64)
+#define LINK_QUAL_AGG_FRAME_LIMIT_MAX 0x3f
#define LINK_QUAL_AGG_FRAME_LIMIT_MIN (0)
/**
ext Johannes Berg wrote:
> On Wed, 2009-07-01 at 08:06 -0700, Marcel Holtmann wrote:
>
>> Hi Johannes,
>>
>>
>>> According to the documentation, the limit is 0x3f == 63, not 64.
>>>
>>> Signed-off-by: Johannes Berg <[email protected]>
>>> ---
>>> It seems bug 2018 is related to the link quality command, because it
>>> seems I can trivially trigger it or similar bugs that way, but this
>>> doesn't fix it.
>>>
>>> --- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:33.804427206 +0200
>>> +++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:38.924427592 +0200
>>> @@ -1922,7 +1922,7 @@ struct iwl_link_qual_general_params {
>>> #define LINK_QUAL_AGG_DISABLE_START_MIN (0)
>>>
>>> #define LINK_QUAL_AGG_FRAME_LIMIT_DEF (31)
>>> -#define LINK_QUAL_AGG_FRAME_LIMIT_MAX (64)
>>> +#define LINK_QUAL_AGG_FRAME_LIMIT_MAX 0x3f
>>> #define LINK_QUAL_AGG_FRAME_LIMIT_MIN (0)
>>>
>> why are you switching of hex now? Just putting (63) in there is not
>> enough?
>>
>
> It would be, obviously, but the doc says 0x3f.
>
I think it would be nicer to have (63) or otherwise convert all the
macros to use the 0x format. Does the spec use 0x1f for the default
value, for instance, instead of (31)?
--
Cheers,
Luca.
Hi Johannes,
> According to the documentation, the limit is 0x3f == 63, not 64.
>
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> It seems bug 2018 is related to the link quality command, because it
> seems I can trivially trigger it or similar bugs that way, but this
> doesn't fix it.
>
> --- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:33.804427206 +0200
> +++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:38.924427592 +0200
> @@ -1922,7 +1922,7 @@ struct iwl_link_qual_general_params {
> #define LINK_QUAL_AGG_DISABLE_START_MIN (0)
>
> #define LINK_QUAL_AGG_FRAME_LIMIT_DEF (31)
> -#define LINK_QUAL_AGG_FRAME_LIMIT_MAX (64)
> +#define LINK_QUAL_AGG_FRAME_LIMIT_MAX 0x3f
> #define LINK_QUAL_AGG_FRAME_LIMIT_MIN (0)
why are you switching of hex now? Just putting (63) in there is not
enough?
Regards
Marcel
On Wed, 2009-07-01 at 08:06 -0700, Marcel Holtmann wrote:
> Hi Johannes,
>
> > According to the documentation, the limit is 0x3f == 63, not 64.
> >
> > Signed-off-by: Johannes Berg <[email protected]>
> > ---
> > It seems bug 2018 is related to the link quality command, because it
> > seems I can trivially trigger it or similar bugs that way, but this
> > doesn't fix it.
> >
> > --- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:33.804427206 +0200
> > +++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:38.924427592 +0200
> > @@ -1922,7 +1922,7 @@ struct iwl_link_qual_general_params {
> > #define LINK_QUAL_AGG_DISABLE_START_MIN (0)
> >
> > #define LINK_QUAL_AGG_FRAME_LIMIT_DEF (31)
> > -#define LINK_QUAL_AGG_FRAME_LIMIT_MAX (64)
> > +#define LINK_QUAL_AGG_FRAME_LIMIT_MAX 0x3f
> > #define LINK_QUAL_AGG_FRAME_LIMIT_MIN (0)
>
> why are you switching of hex now? Just putting (63) in there is not
> enough?
It would be, obviously, but the doc says 0x3f.
johannes
Hi Johannes,
> >>> According to the documentation, the limit is 0x3f == 63, not 64.
> >>>
> >>> Signed-off-by: Johannes Berg <[email protected]>
> >>> ---
> >>> It seems bug 2018 is related to the link quality command, because it
> >>> seems I can trivially trigger it or similar bugs that way, but this
> >>> doesn't fix it.
> >>>
> >>> --- wireless-testing.orig/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:33.804427206 +0200
> >>> +++ wireless-testing/drivers/net/wireless/iwlwifi/iwl-commands.h 2009-07-01 14:53:38.924427592 +0200
> >>> @@ -1922,7 +1922,7 @@ struct iwl_link_qual_general_params {
> >>> #define LINK_QUAL_AGG_DISABLE_START_MIN (0)
> >>>
> >>> #define LINK_QUAL_AGG_FRAME_LIMIT_DEF (31)
> >>> -#define LINK_QUAL_AGG_FRAME_LIMIT_MAX (64)
> >>> +#define LINK_QUAL_AGG_FRAME_LIMIT_MAX 0x3f
> >>> #define LINK_QUAL_AGG_FRAME_LIMIT_MIN (0)
> >>>
> >> why are you switching of hex now? Just putting (63) in there is not
> >> enough?
> >>
> >
> > It would be, obviously, but the doc says 0x3f.
> >
>
> I think it would be nicer to have (63) or otherwise convert all the
> macros to use the 0x format. Does the spec use 0x1f for the default
> value, for instance, instead of (31)?
I would agree. Use (31) and let the commit message explain it. Not that
it is really that important.
Regards
Marcel