From c4d94cd910787b5f543b0b310281efb17c9909d1 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Mon, 22 Nov 2010 00:56:06 +0100 Subject: [PATCH] --- yaml --- r: 228192 b: refs/heads/master c: 8cab2fbe6dacfdd3b122c450d2fffde6ac06a8b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/hard-interface.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7a64a3ae6980..1b2b185feb82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 003db3b2ad61c2964d624b0786cf8202e9a92c8e +refs/heads/master: 8cab2fbe6dacfdd3b122c450d2fffde6ac06a8b6 diff --git a/trunk/drivers/staging/batman-adv/hard-interface.c b/trunk/drivers/staging/batman-adv/hard-interface.c index ff0ac9825001..4f95777ce080 100644 --- a/trunk/drivers/staging/batman-adv/hard-interface.c +++ b/trunk/drivers/staging/batman-adv/hard-interface.c @@ -31,8 +31,6 @@ #include -#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: