diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-06-05 22:31:30 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-01 22:47:21 +0200 |
| commit | 96412690116afcc1b2705615b5a7c8dc6c5e905f (patch) | |
| tree | 0eb2a1a557e2997175b27f3ab925bbdc29ece54d /net/batman-adv/main.c | |
| parent | b4d66b877bc21ce907938bfd027dfe016617fac0 (diff) | |
| download | linux-3.10-96412690116afcc1b2705615b5a7c8dc6c5e905f.tar.gz linux-3.10-96412690116afcc1b2705615b5a7c8dc6c5e905f.tar.bz2 linux-3.10-96412690116afcc1b2705615b5a7c8dc6c5e905f.zip | |
batman-adv: Prefix packet structs with batadv_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 24d651da6fd..97144a98c66 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, struct net_device *orig_dev) { struct bat_priv *bat_priv; - struct batman_ogm_packet *batman_ogm_packet; + struct batadv_ogm_packet *batadv_ogm_packet; struct hard_iface *hard_iface; uint8_t idx; int ret; @@ -237,19 +237,19 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, if (hard_iface->if_status != BATADV_IF_ACTIVE) goto err_free; - batman_ogm_packet = (struct batman_ogm_packet *)skb->data; + batadv_ogm_packet = (struct batadv_ogm_packet *)skb->data; - if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) { + if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Drop packet: incompatible batman version (%i)\n", - batman_ogm_packet->header.version); + batadv_ogm_packet->header.version); goto err_free; } /* all receive handlers return whether they received or reused * the supplied skb. if not, we have to free the skb. */ - idx = batman_ogm_packet->header.packet_type; + idx = batadv_ogm_packet->header.packet_type; ret = (*batadv_rx_handler[idx])(skb, hard_iface); if (ret == NET_RX_DROP) |