2012-11-23 02:09:47

by Chun-Yeow Yeoh

Subject: [PATCH] mac80211: Fix macro definitions in Mesh

Macro definitions should be static inlines.

Reported by: Chaoxing Lin <[email protected]>
Signed-off-by: Chun-Yeow Yeoh <[email protected]>
---
net/mac80211/mesh_hwmp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 47aeee2..5d3e965 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -88,9 +88,9 @@ static inline u32 u16_field_get(u8 *preq_elem, int offset, bool ae)
(msecs_to_jiffies(s->u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval))
#define max_preq_retries(s) (s->u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries)
#define disc_timeout_jiff(s) \
- msecs_to_jiffies(sdata->u.mesh.mshcfg.min_discovery_timeout)
+ msecs_to_jiffies(s->u.mesh.mshcfg.min_discovery_timeout)
#define root_path_confirmation_jiffies(s) \
- msecs_to_jiffies(sdata->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval)
+ msecs_to_jiffies(s->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval)

enum mpath_frame_type {
MPATH_PREQ = 0,
--
1.7.0.4

2012-11-23 11:18:25

by Kalle Valo

Subject: Re: [PATCH] mac80211: Fix macro definitions in Mesh

Thomas Pedersen <[email protected]> writes:

> On Thu, Nov 22, 2012 at 5:59 PM, Chun-Yeow Yeoh <[email protected]> wrote:
>> Macro definitions should be static inlines.
>
> Then maybe this patch should do that as well? :)

Only one logical change per patch ;)

--
Kalle Valo

2012-11-23 02:43:03

by Thomas Pedersen

Subject: Re: [PATCH] mac80211: Fix macro definitions in Mesh

On Thu, Nov 22, 2012 at 5:59 PM, Chun-Yeow Yeoh <[email protected]> wrote:
> Macro definitions should be static inlines.

Then maybe this patch should do that as well? :)

> Reported by: Chaoxing Lin <[email protected]>
> Signed-off-by: Chun-Yeow Yeoh <[email protected]>
> ---
> net/mac80211/mesh_hwmp.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
> index 47aeee2..5d3e965 100644
> --- a/net/mac80211/mesh_hwmp.c
> +++ b/net/mac80211/mesh_hwmp.c
> @@ -88,9 +88,9 @@ static inline u32 u16_field_get(u8 *preq_elem, int offset, bool ae)
> (msecs_to_jiffies(s->u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval))
> #define max_preq_retries(s) (s->u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries)
> #define disc_timeout_jiff(s) \
> - msecs_to_jiffies(sdata->u.mesh.mshcfg.min_discovery_timeout)
> + msecs_to_jiffies(s->u.mesh.mshcfg.min_discovery_timeout)
> #define root_path_confirmation_jiffies(s) \
> - msecs_to_jiffies(sdata->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval)
> + msecs_to_jiffies(s->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval)
>
> enum mpath_frame_type {
> MPATH_PREQ = 0,
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html