| Message ID | 1353635958-12298-1-git-send-email-yeohchunyeow@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, Nov 22, 2012 at 5:59 PM, Chun-Yeow Yeoh <yeohchunyeow@gmail.com> wrote: > Macro definitions should be static inlines. Then maybe this patch should do that as well? :) > Reported by: Chaoxing Lin <Chaoxing.Lin@ultra-3eti.com> > Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> > --- > 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 majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thomas Pedersen <thomas@cozybit.com> writes: > On Thu, Nov 22, 2012 at 5:59 PM, Chun-Yeow Yeoh <yeohchunyeow@gmail.com> wrote: >> Macro definitions should be static inlines. > > Then maybe this patch should do that as well? :) Only one logical change per patch ;)
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,
Macro definitions should be static inlines. Reported by: Chaoxing Lin <Chaoxing.Lin@ultra-3eti.com> Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> --- net/mac80211/mesh_hwmp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)