On Wed, Jan 02, 2013 at 07:44:21PM +0800, Marek Lindner wrote:
On Wednesday, January 02, 2013 15:48:13 Antonio Quartulli wrote:
@@ -468,6 +442,7 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, memcpy(skb_buff, packet_buff, packet_len);
forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++;
forw_packet_aggr->own |= own_packet;
/* save packet direct link flag status */ if (direct_link) {
Using "|= own_packet" isn't strictly necessary because "forw_packet_aggr->own" isn't a bit field.
Well the point is that here own_packet could be false, but forw_packet_aggr->own might already be true, so I didn't want to destroy the original value.
Good point. However, your "solution" is far from obvious. Either you make it more obvious or you should add a comment.
Oky. Will try to make it more clear and avoid obfuscated code :)
Did you vigorously test this code ? Especially, multi-node with multiple interface setups are of interest. Also use different orig intervals to ensure it still works everywhere.
I will try more topologies and in particular different orig intervals as soon as I have the possibility
Ok.
The thing is: Throughout the code you can find the implicite assumption of the first aggregated packet being an "own packet" (if forw_packet_aggr->own is set). Therefore, you have to be very careful changing that logic. One function you definitely overlooked is batadv_iv_ogm_send_to_if() but there might be others.
You did not comment this section. Hopefully it wasn't overlooked ?
no, it wasn't. I simply silently acknowledged your comment :)
+/**
- batadv_iv_ogm_send - prepare an send an own OGM
- @work: kernel work struct
- Prepare the OGM and immediately enqueue it for sending
- */
prepare and send an own OGM
^^^well, technically it is enqueued, not sent..
Your kernel doc states: batadv_iv_ogm_send - prepare an send an own OGM
Therefore I proposed a fix: batadv_iv_ogm_send - prepare and send an own OGM
oh, right! I just read the line above your comment, not the rest.
If you wish to reword it altogether that's also ok for me.
mh, maybe. Thanks²
Cheers,