[linux-next] LinuxNextTracking branch, master, updated. next-20171009

batman at open-mesh.org batman at open-mesh.org
Tue Oct 10 00:16:42 CEST 2017


The following commit has been merged in the master branch:
commit 48915aed60c9615e5eaa0f1683640635dade788e
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu Sep 28 17:16:51 2017 +0200

    batman-adv: Fix "line over 80 characters" checkpatch warning
    
    Fixes: 242c1a28eb61 ("net: Remove useless function skb_header_release")
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 7c8288245f80..3af4b0b29b23 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -69,8 +69,8 @@ int batadv_skb_head_push(struct sk_buff *skb, unsigned int len)
 	int result;
 
 	/* TODO: We must check if we can release all references to non-payload
-	 * data using __skb_header_release in our skbs to allow skb_cow_header to
-	 * work optimally. This means that those skbs are not allowed to read
+	 * data using __skb_header_release in our skbs to allow skb_cow_header
+	 * to work optimally. This means that those skbs are not allowed to read
 	 * or write any data which is before the current position of skb->data
 	 * after that call and thus allow other skbs with the same data buffer
 	 * to write freely in that area.

-- 
LinuxNextTracking


More information about the linux-merge mailing list