Signed-off-by: Marek Lindner lindner_marek@yahoo.de ---
v2: - simplified approach of same check
bat_iv_ogm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 7654b76..2ce7b28 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1297,7 +1297,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
/* unpack the aggregated packets and process them one by one */ - do { + while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, + batadv_ogm_packet->tt_num_changes)) { tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN;
batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff, @@ -1308,8 +1309,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,
packet_pos = packet_buff + buff_pos; batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; - } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, - batadv_ogm_packet->tt_num_changes)); + }
kfree_skb(skb); return NET_RX_SUCCESS;
On Monday, March 04, 2013 20:26:05 Marek Lindner wrote:
Signed-off-by: Marek Lindner lindner_marek@yahoo.de
v2:
- simplified approach of same check
bat_iv_ogm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied in revision e56c79f.
@Antonio: This is stable-ware.
Regards, Marek
On Sat, Mar 09, 2013 at 06:02:30PM +0800, Marek Lindner wrote:
On Monday, March 04, 2013 20:26:05 Marek Lindner wrote:
Signed-off-by: Marek Lindner lindner_marek@yahoo.de
v2:
- simplified approach of same check
bat_iv_ogm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied in revision e56c79f.
@Antonio: This is stable-ware.
Yes, will take care of that. Thanks,
b.a.t.m.a.n@lists.open-mesh.org