Merge tag 'nfs-for-4.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / net / batman-adv / sysfs.c

diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index d6a312a82c03d509e3a83cac873986a45ef3307c..9de3c8804ff48de8a8b7a9fab6b0c2660b51a88f 100644 (file)
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -457,7 +457,7 @@ static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,
                                     struct attribute *attr, char *buff)
 {
        struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj);
-       uint32_t down, up;
+       u32 down, up;
 
        down = atomic_read(&bat_priv->gw.bandwidth_down);
        up = atomic_read(&bat_priv->gw.bandwidth_up);
@@ -512,7 +512,7 @@ static ssize_t batadv_store_isolation_mark(struct kobject *kobj,
 {
        struct net_device *net_dev = batadv_kobj_to_netdev(kobj);
        struct batadv_priv *bat_priv = netdev_priv(net_dev);
-       uint32_t mark, mask;
+       u32 mark, mask;
        char *mask_ptr;
 
        /* parse the mask if it has been specified, otherwise assume the mask is