* [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
@ 2012-05-04 4:36 Chun-Yeow Yeoh
[not found] ` <CAPjQAd8YK9Zy17z5KQ2uxVk7mH2qK-SLT3UObbU46NTkGv-cDA@mail.gmail.com>
2012-05-07 7:43 ` Johannes Berg
0 siblings, 2 replies; 8+ messages in thread
From: Chun-Yeow Yeoh @ 2012-05-04 4:36 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes, javier, linville, devel, Chun-Yeow Yeoh
Forwarded PREQ is either unicast or multicast. The appropriate counters
should be incremented accordingly.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
---
net/mac80211/mesh_hwmp.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 503016f..f0695e5 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -603,7 +603,10 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
hopcount, ttl, cpu_to_le32(lifetime),
cpu_to_le32(metric), cpu_to_le32(preq_id),
sdata);
- ifmsh->mshstats.fwded_mcast++;
+ if (da != broadcast_addr)
+ ifmsh->mshstats.fwded_unicast++;
+ else
+ ifmsh->mshstats.fwded_mcast++;
ifmsh->mshstats.fwded_frames++;
}
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread[parent not found: <CAPjQAd8YK9Zy17z5KQ2uxVk7mH2qK-SLT3UObbU46NTkGv-cDA@mail.gmail.com>]
* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
[not found] ` <CAPjQAd8YK9Zy17z5KQ2uxVk7mH2qK-SLT3UObbU46NTkGv-cDA@mail.gmail.com>
@ 2012-05-04 6:45 ` Yeoh Chun-Yeow
0 siblings, 0 replies; 8+ messages in thread
From: Yeoh Chun-Yeow @ 2012-05-04 6:45 UTC (permalink / raw)
To: Javier Cardona
Cc: linux-wireless@vger.kernel.org, johannes@sipsolutions.net,
linville@tuxdriver.com, devel@lists.open80211s.org
Hi, Javier
Will do.
Chun-Yeow
On Fri, May 4, 2012 at 2:17 PM, Javier Cardona <javier@cozybit.com> wrote:
> Hi Yeoh,
>
>
> On Friday, May 4, 2012, Chun-Yeow Yeoh wrote:
>>
>> Forwarded PREQ is either unicast or multicast. The appropriate counters
>> should be incremented accordingly.
>>
>> Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
>> ---
>> net/mac80211/mesh_hwmp.c | 5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
>> index 503016f..f0695e5 100644
>> --- a/net/mac80211/mesh_hwmp.c
>> +++ b/net/mac80211/mesh_hwmp.c
>> @@ -603,7 +603,10 @@ static void hwmp_preq_frame_process(struct
>> ieee80211_sub_if_data *sdata,
>> hopcount, ttl, cpu_to_le32(lifetime),
>> cpu_to_le32(metric), cpu_to_le32(preq_id),
>> sdata);
>> - ifmsh->mshstats.fwded_mcast++;
>> + if (da != broadcast_addr)
>> + ifmsh->mshstats.fwded_unicast++;
>> + else
>> + ifmsh->mshstats.fwded_mcast++;
>> ifmsh->mshstats.fwded_frames++;
>> }
>> }
>> --
>> 1.7.0.4
>
>
> I think you should check for multicast, not just bcast. And use the
> existing helper function to do so.
>
> Javier
>
>
> --
> Javier Cardona
> cozybit Inc.
> http://www.cozybit.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
2012-05-04 4:36 [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ Chun-Yeow Yeoh
[not found] ` <CAPjQAd8YK9Zy17z5KQ2uxVk7mH2qK-SLT3UObbU46NTkGv-cDA@mail.gmail.com>
@ 2012-05-07 7:43 ` Johannes Berg
2012-05-07 8:58 ` Yeoh Chun-Yeow
1 sibling, 1 reply; 8+ messages in thread
From: Johannes Berg @ 2012-05-07 7:43 UTC (permalink / raw)
To: Chun-Yeow Yeoh; +Cc: linux-wireless, javier, linville, devel
On Fri, 2012-05-04 at 12:36 +0800, Chun-Yeow Yeoh wrote:
> Forwarded PREQ is either unicast or multicast. The appropriate counters
> should be incremented accordingly.
>
> Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
> ---
> net/mac80211/mesh_hwmp.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
> index 503016f..f0695e5 100644
> --- a/net/mac80211/mesh_hwmp.c
> +++ b/net/mac80211/mesh_hwmp.c
> @@ -603,7 +603,10 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
> hopcount, ttl, cpu_to_le32(lifetime),
> cpu_to_le32(metric), cpu_to_le32(preq_id),
> sdata);
> - ifmsh->mshstats.fwded_mcast++;
> + if (da != broadcast_addr)
In addition to what Javier said. Err. Think about this comparison again.
johannes
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
2012-05-07 7:43 ` Johannes Berg
@ 2012-05-07 8:58 ` Yeoh Chun-Yeow
2012-05-07 9:21 ` Johannes Berg
0 siblings, 1 reply; 8+ messages in thread
From: Yeoh Chun-Yeow @ 2012-05-07 8:58 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, javier, linville, devel
Hi, Johannes
If the destination address is not broadcast frame, the number of
forwarded unicast frame is increased. And the other way round. Not
correct?
+ if (!is_multicast_ether_addr(da))
+ ifmsh->mshstats.fwded_unicast++;
+ else
+ ifmsh->mshstats.fwded_mcast++;
Regards,
Chun-Yeow
On Mon, May 7, 2012 at 3:43 PM, Johannes Berg <johannes@sipsolutions.net> wrote:
> On Fri, 2012-05-04 at 12:36 +0800, Chun-Yeow Yeoh wrote:
>> Forwarded PREQ is either unicast or multicast. The appropriate counters
>> should be incremented accordingly.
>>
>> Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
>> ---
>> net/mac80211/mesh_hwmp.c | 5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
>> index 503016f..f0695e5 100644
>> --- a/net/mac80211/mesh_hwmp.c
>> +++ b/net/mac80211/mesh_hwmp.c
>> @@ -603,7 +603,10 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
>> hopcount, ttl, cpu_to_le32(lifetime),
>> cpu_to_le32(metric), cpu_to_le32(preq_id),
>> sdata);
>> - ifmsh->mshstats.fwded_mcast++;
>> + if (da != broadcast_addr)
>
> In addition to what Javier said. Err. Think about this comparison again.
>
> johannes
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
2012-05-07 8:58 ` Yeoh Chun-Yeow
@ 2012-05-07 9:21 ` Johannes Berg
2012-05-07 10:19 ` Yeoh Chun-Yeow
0 siblings, 1 reply; 8+ messages in thread
From: Johannes Berg @ 2012-05-07 9:21 UTC (permalink / raw)
To: Yeoh Chun-Yeow; +Cc: linux-wireless, javier, linville, devel
Hi,
> If the destination address is not broadcast frame, the number of
> forwarded unicast frame is increased. And the other way round. Not
> correct?
>
> + if (!is_multicast_ether_addr(da))
> + ifmsh->mshstats.fwded_unicast++;
> + else
> + ifmsh->mshstats.fwded_mcast++;
No, your new code is fine, but this
> >> + if (da != broadcast_addr)
will never be false.
johannes
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
2012-05-07 9:21 ` Johannes Berg
@ 2012-05-07 10:19 ` Yeoh Chun-Yeow
2012-05-07 10:41 ` Kalle Valo
0 siblings, 1 reply; 8+ messages in thread
From: Yeoh Chun-Yeow @ 2012-05-07 10:19 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, javier, linville, devel
Hi, Johannes
>> >> + if (da != broadcast_addr)
>
> will never be false.
Hmm, but I have a check on this and it works. The previous line will
set the da either as broadcast addr or unicast addr.
da = (mpath && mpath->is_root) ?
mpath->rann_snd_addr : broadcast_addr;
Chun-Yeow
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
2012-05-07 10:19 ` Yeoh Chun-Yeow
@ 2012-05-07 10:41 ` Kalle Valo
2012-05-07 10:54 ` Yeoh Chun-Yeow
0 siblings, 1 reply; 8+ messages in thread
From: Kalle Valo @ 2012-05-07 10:41 UTC (permalink / raw)
To: Yeoh Chun-Yeow; +Cc: Johannes Berg, linux-wireless, javier, linville, devel
Yeoh Chun-Yeow <yeohchunyeow@gmail.com> writes:
> Hi, Johannes
>
>>> >> + if (da != broadcast_addr)
>>
>> will never be false.
>
> Hmm, but I have a check on this and it works. The previous line will
> set the da either as broadcast addr or unicast addr.
You are comparing pointers, not addresses. If you do that on purpose
then it's very confusing.
--
Kalle Valo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ
2012-05-07 10:41 ` Kalle Valo
@ 2012-05-07 10:54 ` Yeoh Chun-Yeow
0 siblings, 0 replies; 8+ messages in thread
From: Yeoh Chun-Yeow @ 2012-05-07 10:54 UTC (permalink / raw)
To: Kalle Valo; +Cc: Johannes Berg, linux-wireless, javier, linville, devel
Hi, Kalle,
Appreciate your explanation. I understand my mistake.
Thanks
Regards,
Chun-Yeow
On Mon, May 7, 2012 at 6:41 PM, Kalle Valo <kvalo@adurom.com> wrote:
> Yeoh Chun-Yeow <yeohchunyeow@gmail.com> writes:
>
>> Hi, Johannes
>>
>>>> >> + if (da != broadcast_addr)
>>>
>>> will never be false.
>>
>> Hmm, but I have a check on this and it works. The previous line will
>> set the da either as broadcast addr or unicast addr.
>
> You are comparing pointers, not addresses. If you do that on purpose
> then it's very confusing.
>
> --
> Kalle Valo
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-05-07 11:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-04 4:36 [PATCH] fix the increment of unicast/multicast counters for forwarded PREQ Chun-Yeow Yeoh
[not found] ` <CAPjQAd8YK9Zy17z5KQ2uxVk7mH2qK-SLT3UObbU46NTkGv-cDA@mail.gmail.com>
2012-05-04 6:45 ` Yeoh Chun-Yeow
2012-05-07 7:43 ` Johannes Berg
2012-05-07 8:58 ` Yeoh Chun-Yeow
2012-05-07 9:21 ` Johannes Berg
2012-05-07 10:19 ` Yeoh Chun-Yeow
2012-05-07 10:41 ` Kalle Valo
2012-05-07 10:54 ` Yeoh Chun-Yeow
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox