[1/2] batman-adv: Use kernel version min macro
Commit Message
The kernel headers already provide different versions of a min/max macro
which should be used by all modules according to
Documentation/CodingStyle.
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
batman-adv/hard-interface.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
Comments
On Tuesday 09 November 2010 00:53:00 Sven Eckelmann wrote:
> The kernel headers already provide different versions of a min/max macro
> which should be used by all modules according to
> Documentation/CodingStyle.
Applied in revision 1872.
Thanks,
Marek
@@ -31,8 +31,6 @@
#include <linux/if_arp.h>
-#define MIN(x, y) ((x) < (y) ? (x) : (y))
-
/* protect update critical side of if_list - but not the content */
static DEFINE_SPINLOCK(if_list_lock);
@@ -220,8 +218,8 @@ int hardif_min_mtu(struct net_device *soft_iface)
if (batman_if->soft_iface != soft_iface)
continue;
- min_mtu = MIN(batman_if->net_dev->mtu - BAT_HEADER_LEN,
- min_mtu);
+ min_mtu = min_t(int, batman_if->net_dev->mtu - BAT_HEADER_LEN,
+ min_mtu);
}
rcu_read_unlock();
out: