Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 413758065323767a3258a68ee00d8c1ef24bd4a5..af7a6741a685dbe8f06f7a844ef404b364736772 100644 (file)
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -45,8 +45,8 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
                goto send_skb_err;
 
        if (!(hard_iface->net_dev->flags & IFF_UP)) {
-               pr_warning("Interface %s is not up - can't send packet via "
-                          "that interface!\n", hard_iface->net_dev->name);
+               pr_warning("Interface %s is not up - can't send packet via that interface!\n",
+                          hard_iface->net_dev->name);
                goto send_skb_err;
        }
 
@@ -56,7 +56,7 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
 
        skb_reset_mac_header(skb);
 
-       ethhdr = (struct ethhdr *) skb_mac_header(skb);
+       ethhdr = (struct ethhdr *)skb_mac_header(skb);
        memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN);
        memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN);
        ethhdr->h_proto = __constant_htons(ETH_P_BATMAN);