batman-adv: tvlv realloc, move error handling into if block

Instead of hiding the normal function flow inside an if block, we should
just put the error handling into the if block.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index ca63d487c490ed3a08e286b5d0b6d0d231a566ad..fd9333dffc97182631c29fc91d0b9357c7804d32 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -819,15 +819,15 @@ static bool batadv_tvlv_realloc_packet_buff(unsigned char **packet_buff,
        new_buff = kmalloc(min_packet_len + additional_packet_len, GFP_ATOMIC);
 
        /* keep old buffer if kmalloc should fail */
-       if (new_buff) {
-               memcpy(new_buff, *packet_buff, min_packet_len);
-               kfree(*packet_buff);
-               *packet_buff = new_buff;
-               *packet_buff_len = min_packet_len + additional_packet_len;
-               return true;
-       }
+       if (!new_buff)
+               return false;
+
+       memcpy(new_buff, *packet_buff, min_packet_len);
+       kfree(*packet_buff);
+       *packet_buff = new_buff;
+       *packet_buff_len = min_packet_len + additional_packet_len;
 
-       return false;
+       return true;
 }
 
 /**