[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 706cc9f51d9a22528af18d4b3ffbd17b30a1d3b0
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Sep 30 09:24:28 2017 +0200

    batman-adv: Add argument names for function ptr definitions
    
    checkpatch started to report unnamed arguments in function pointer
    definitions. Add the corresponding names to these definitions to avoid this
    warning.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 033819aefc39..4daed7ad46f2 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -73,8 +73,8 @@
  * list traversals just rcu-locked
  */
 struct list_head batadv_hardif_list;
-static int (*batadv_rx_handler[256])(struct sk_buff *,
-				     struct batadv_hard_iface *);
+static int (*batadv_rx_handler[256])(struct sk_buff *skb,
+				     struct batadv_hard_iface *recv_if);
 
 unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
@@ -540,8 +540,8 @@ batadv_recv_handler_register(u8 packet_type,
 			     int (*recv_handler)(struct sk_buff *,
 						 struct batadv_hard_iface *))
 {
-	int (*curr)(struct sk_buff *,
-		    struct batadv_hard_iface *);
+	int (*curr)(struct sk_buff *skb,
+		    struct batadv_hard_iface *recv_if);
 	curr = batadv_rx_handler[packet_type];
 
 	if (curr != batadv_recv_unhandled_packet &&

-- 
LinuxNextTracking


More information about the linux-merge mailing list