Merge ath-next from ath.git

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / distributed-arp-table.h

diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 3181507ebc14015c1d82b049f70c8233c760434a..26d4a525a798ec37b644e789b5176475e0cf0d92 100644 (file)
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -54,7 +54,7 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,
 static inline void
 batadv_dat_init_orig_node_addr(struct batadv_orig_node *orig_node)
 {
-       uint32_t addr;
+       u32 addr;
 
        addr = batadv_choose_orig(orig_node->orig, BATADV_DAT_ADDR_MAX);
        orig_node->dat_addr = (batadv_dat_addr_t)addr;
@@ -69,7 +69,7 @@ static inline void
 batadv_dat_init_own_addr(struct batadv_priv *bat_priv,
                         struct batadv_hard_iface *primary_if)
 {
-       uint32_t addr;
+       u32 addr;
 
        addr = batadv_choose_orig(primary_if->net_dev->dev_addr,
                                  BATADV_DAT_ADDR_MAX);
@@ -89,7 +89,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset);
  * Updates the ethtool statistics for the received packet if it is a DAT subtype
  */
 static inline void batadv_dat_inc_counter(struct batadv_priv *bat_priv,
-                                         uint8_t subtype)
+                                         u8 subtype)
 {
        switch (subtype) {
        case BATADV_P_DAT_DHT_GET:
@@ -169,7 +169,7 @@ static inline void batadv_dat_free(struct batadv_priv *bat_priv)
 }
 
 static inline void batadv_dat_inc_counter(struct batadv_priv *bat_priv,
-                                         uint8_t subtype)
+                                         u8 subtype)
 {
 }