The following commit has been merged in the merge/master branch: commit 85ab3fc8ce96d253267ff0ec14b8ccd0c41f3659 Author: Antonio Quartulli ordex@autistici.org Date: Tue Apr 24 10:13:00 2012 +0200
batman-adv: use fake functions instead of defines for not compiled-in routines
Signed-off-by: Antonio Quartulli ordex@autistici.org
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3108cd3..6935be9 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -96,7 +96,10 @@ static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb,
#else
-#define bat_dbg_arp(...) +static void bat_dbg_arp(struct bat_priv *bat_priv, struct sk_buff *skb, + uint16_t type, int hdr_size, char *msg) +{ +}
#endif /* CONFIG_BATMAN_ADV_DEBUG */