aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bat_iv_ogm.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
-rw-r--r--net/batman-adv/bat_iv_ogm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index f48467ff6713..1566eac02d4c 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -201,7 +201,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,
201 batadv_inc_counter(bat_priv, BAT_CNT_MGMT_TX); 201 batadv_inc_counter(bat_priv, BAT_CNT_MGMT_TX);
202 batadv_add_counter(bat_priv, BAT_CNT_MGMT_TX_BYTES, 202 batadv_add_counter(bat_priv, BAT_CNT_MGMT_TX_BYTES,
203 skb->len + ETH_HLEN); 203 skb->len + ETH_HLEN);
204 send_skb_packet(skb, hard_iface, broadcast_addr); 204 batadv_send_skb_packet(skb, hard_iface, broadcast_addr);
205 } 205 }
206} 206}
207 207
@@ -250,8 +250,9 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
250 forw_packet->if_incoming->net_dev->dev_addr); 250 forw_packet->if_incoming->net_dev->dev_addr);
251 251
252 /* skb is only used once and than forw_packet is free'd */ 252 /* skb is only used once and than forw_packet is free'd */
253 send_skb_packet(forw_packet->skb, forw_packet->if_incoming, 253 batadv_send_skb_packet(forw_packet->skb,
254 broadcast_addr); 254 forw_packet->if_incoming,
255 broadcast_addr);
255 forw_packet->skb = NULL; 256 forw_packet->skb = NULL;
256 257
257 goto out; 258 goto out;
@@ -420,7 +421,7 @@ static void bat_iv_ogm_aggregate_new(const unsigned char *packet_buff,
420 421
421 /* start timer for this packet */ 422 /* start timer for this packet */
422 INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work, 423 INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work,
423 send_outstanding_bat_ogm_packet); 424 batadv_send_outstanding_bat_ogm_packet);
424 queue_delayed_work(bat_event_workqueue, 425 queue_delayed_work(bat_event_workqueue,
425 &forw_packet_aggr->delayed_work, 426 &forw_packet_aggr->delayed_work,
426 send_time - jiffies); 427 send_time - jiffies);