[2/2] batman-adv: layer2 unicast packet fragmentation

Message ID 201007091651.27867.sven.eckelmann@gmx.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann July 9, 2010, 2:51 p.m. UTC
  Andreas Langer wrote:
> +	if (atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
> +		ETH_DATA_LEN + BAT_HEADER_LEN)
> +		bat_info(soft_device,
> +			"The MTU of interface %s is too small (%zi) to handle "
> +			"the transport of batman-adv packets. Packets going "
> +			"over this interface will be fragmented on layer2 "
> +			"which could impact the performance. Setting the MTU "
> +			"to %zi would solve the problem.\n",
> +			batman_if->dev, batman_if->net_dev->mtu,
> +			ETH_DATA_LEN + BAT_HEADER_LEN);
> +
> +	if (!atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
> +		ETH_DATA_LEN + BAT_HEADER_LEN)
> +		bat_info(soft_device,
> +			"The MTU of interface %s is too small (%zi) to handle "
> +			"the transport of batman-adv packets. If you experience"
> +			" problems getting traffic through try increasing the "
> +			"MTU to %zi.\n",
> +			batman_if->dev, batman_if->net_dev->mtu,
> +			ETH_DATA_LEN + BAT_HEADER_LEN);
> +
>  	if (hardif_is_iface_up(batman_if))
>  		hardif_activate_interface(soft_device, bat_priv, batman_if);


Nach der Aenderung der Argumente muesstest du das erste %zi wieder in ein %i
umaendern:
  

Patch

diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c
index 1177e93..9dbbe2b 100644
--- a/batman-adv/hard-interface.c
+++ b/batman-adv/hard-interface.c
@@ -276,7 +276,7 @@  int hardif_enable_interface(struct batman_if *batman_if)
 	if (atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
 		ETH_DATA_LEN + BAT_HEADER_LEN)
 		bat_info(soft_device,
-			"The MTU of interface %s is too small (%zi) to handle "
+			"The MTU of interface %s is too small (%i) to handle "
 			"the transport of batman-adv packets. Packets going "
 			"over this interface will be fragmented on layer2 "
 			"which could impact the performance. Setting the MTU "
@@ -287,7 +287,7 @@  int hardif_enable_interface(struct batman_if *batman_if)
 	if (!atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
 		ETH_DATA_LEN + BAT_HEADER_LEN)
 		bat_info(soft_device,
-			"The MTU of interface %s is too small (%zi) to handle "
+			"The MTU of interface %s is too small (%i) to handle "
 			"the transport of batman-adv packets. If you experience"
 			" problems getting traffic through try increasing the "
 			"MTU to %zi.\n",