Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc...

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / send.h

diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index 0536835fe5034ca24ec925db67314362c52d3f55..82059f259e4682d52997eb1a0f8692c627569ec9 100644 (file)
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -25,15 +25,12 @@
 
 #include "packet.h"
 
-struct batadv_hard_iface;
-struct batadv_orig_node;
-struct batadv_priv;
 struct sk_buff;
 struct work_struct;
 
 int batadv_send_skb_packet(struct sk_buff *skb,
                           struct batadv_hard_iface *hard_iface,
-                          const uint8_t *dst_addr);
+                          const u8 *dst_addr);
 int batadv_send_skb_to_orig(struct sk_buff *skb,
                            struct batadv_orig_node *orig_node,
                            struct batadv_hard_iface *recv_if);
@@ -56,7 +53,7 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv,
                            unsigned short vid);
 int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv,
                                   struct sk_buff *skb, int packet_type,
-                                  int packet_subtype, uint8_t *dst_hint,
+                                  int packet_subtype, u8 *dst_hint,
                                   unsigned short vid);
 int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
                           unsigned short vid);
@@ -75,7 +72,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
  * Returns NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise.
  */
 static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,
-                                        struct sk_buff *skb, uint8_t *dst_hint,
+                                        struct sk_buff *skb, u8 *dst_hint,
                                         unsigned short vid)
 {
        return batadv_send_skb_via_tt_generic(bat_priv, skb, BATADV_UNICAST, 0,
@@ -100,7 +97,7 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,
 static inline int batadv_send_skb_via_tt_4addr(struct batadv_priv *bat_priv,
                                               struct sk_buff *skb,
                                               int packet_subtype,
-                                              uint8_t *dst_hint,
+                                              u8 *dst_hint,
                                               unsigned short vid)
 {
        return batadv_send_skb_via_tt_generic(bat_priv, skb,