aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/main.c')
-rw-r--r--net/batman-adv/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 24d651da6fd7..97144a98c66f 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -205,7 +205,7 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
205 struct net_device *orig_dev) 205 struct net_device *orig_dev)
206{ 206{
207 struct bat_priv *bat_priv; 207 struct bat_priv *bat_priv;
208 struct batman_ogm_packet *batman_ogm_packet; 208 struct batadv_ogm_packet *batadv_ogm_packet;
209 struct hard_iface *hard_iface; 209 struct hard_iface *hard_iface;
210 uint8_t idx; 210 uint8_t idx;
211 int ret; 211 int ret;
@@ -237,19 +237,19 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
237 if (hard_iface->if_status != BATADV_IF_ACTIVE) 237 if (hard_iface->if_status != BATADV_IF_ACTIVE)
238 goto err_free; 238 goto err_free;
239 239
240 batman_ogm_packet = (struct batman_ogm_packet *)skb->data; 240 batadv_ogm_packet = (struct batadv_ogm_packet *)skb->data;
241 241
242 if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) { 242 if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
243 batadv_dbg(BATADV_DBG_BATMAN, bat_priv, 243 batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
244 "Drop packet: incompatible batman version (%i)\n", 244 "Drop packet: incompatible batman version (%i)\n",
245 batman_ogm_packet->header.version); 245 batadv_ogm_packet->header.version);
246 goto err_free; 246 goto err_free;
247 } 247 }
248 248
249 /* all receive handlers return whether they received or reused 249 /* all receive handlers return whether they received or reused
250 * the supplied skb. if not, we have to free the skb. 250 * the supplied skb. if not, we have to free the skb.
251 */ 251 */
252 idx = batman_ogm_packet->header.packet_type; 252 idx = batadv_ogm_packet->header.packet_type;
253 ret = (*batadv_rx_handler[idx])(skb, hard_iface); 253 ret = (*batadv_rx_handler[idx])(skb, hard_iface);
254 254
255 if (ret == NET_RX_DROP) 255 if (ret == NET_RX_DROP)