summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/hard-interface.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-02-28 04:55:36 -0500
committerMarek Lindner <lindner_marek@yahoo.de>2012-02-28 06:14:31 -0500
commit7c64fd98ce512de6c6dae0452dc026446bd368d5 (patch)
tree81b5a3df9c7937f1d85cc9f32841fe9b949ca0bb /net/batman-adv/hard-interface.c
parentfdc8ff101163f10d36187a890a3c4990cebb8b12 (diff)
batman-adv: Fix indentation of multiline statements
Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/hard-interface.c')
-rw-r--r--net/batman-adv/hard-interface.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 41826b96d9f1..409d0273c9d1 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -341,23 +341,23 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
341 if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < 341 if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
342 ETH_DATA_LEN + BAT_HEADER_LEN) 342 ETH_DATA_LEN + BAT_HEADER_LEN)
343 bat_info(hard_iface->soft_iface, 343 bat_info(hard_iface->soft_iface,
344 "The MTU of interface %s is too small (%i) to handle " 344 "The MTU of interface %s is too small (%i) to handle "
345 "the transport of batman-adv packets. Packets going " 345 "the transport of batman-adv packets. Packets going "
346 "over this interface will be fragmented on layer2 " 346 "over this interface will be fragmented on layer2 "
347 "which could impact the performance. Setting the MTU " 347 "which could impact the performance. Setting the MTU "
348 "to %zi would solve the problem.\n", 348 "to %zi would solve the problem.\n",
349 hard_iface->net_dev->name, hard_iface->net_dev->mtu, 349 hard_iface->net_dev->name, hard_iface->net_dev->mtu,
350 ETH_DATA_LEN + BAT_HEADER_LEN); 350 ETH_DATA_LEN + BAT_HEADER_LEN);
351 351
352 if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < 352 if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
353 ETH_DATA_LEN + BAT_HEADER_LEN) 353 ETH_DATA_LEN + BAT_HEADER_LEN)
354 bat_info(hard_iface->soft_iface, 354 bat_info(hard_iface->soft_iface,
355 "The MTU of interface %s is too small (%i) to handle " 355 "The MTU of interface %s is too small (%i) to handle "
356 "the transport of batman-adv packets. If you experience" 356 "the transport of batman-adv packets. If you "
357 " problems getting traffic through try increasing the " 357 "experience problems getting traffic through try "
358 "MTU to %zi.\n", 358 "increasing the MTU to %zi.\n",
359 hard_iface->net_dev->name, hard_iface->net_dev->mtu, 359 hard_iface->net_dev->name, hard_iface->net_dev->mtu,
360 ETH_DATA_LEN + BAT_HEADER_LEN); 360 ETH_DATA_LEN + BAT_HEADER_LEN);
361 361
362 if (hardif_is_iface_up(hard_iface)) 362 if (hardif_is_iface_up(hard_iface))
363 hardif_activate_interface(hard_iface); 363 hardif_activate_interface(hard_iface);
@@ -580,8 +580,8 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
580 goto err_free; 580 goto err_free;
581 581
582 /* expect a valid ethernet header here. */ 582 /* expect a valid ethernet header here. */
583 if (unlikely(skb->mac_len != sizeof(struct ethhdr) 583 if (unlikely(skb->mac_len != sizeof(struct ethhdr) ||
584 || !skb_mac_header(skb))) 584 !skb_mac_header(skb)))
585 goto err_free; 585 goto err_free;
586 586
587 if (!hard_iface->soft_iface) 587 if (!hard_iface->soft_iface)