From patchwork Sat May 14 07:08:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shan Wei X-Patchwork-Id: 95546 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 11F87B6EF0 for ; Sat, 14 May 2011 17:08:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752232Ab1ENHIu (ORCPT ); Sat, 14 May 2011 03:08:50 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:50292 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750875Ab1ENHIt (ORCPT ); Sat, 14 May 2011 03:08:49 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 72413170119; Sat, 14 May 2011 15:08:47 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p4E78kQ6008271; Sat, 14 May 2011 15:08:46 +0800 Received: from [10.167.225.31] ([10.167.225.31]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011051415085962-282201 ; Sat, 14 May 2011 15:08:59 +0800 Message-ID: <4DCE2A7F.1040000@cn.fujitsu.com> Date: Sat, 14 May 2011 15:08:47 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110419 Thunderbird/3.1.9 MIME-Version: 1.0 To: fubar@us.ibm.com, andy@greyhouse.net, David Miller , jpirko@redhat.com, =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Eric Dumazet , ebiederm@aristanetworks.com, netdev Subject: [PATCH net-next] net: drivers: kill two unused macro definitions X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-05-14 15:08:59, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-05-14 15:08:59, Serialize complete at 2011-05-14 15:08:59 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Shan Wei Reviewed-by: Jiri Pirko --- drivers/net/bonding/bonding.h | 10 ---------- drivers/net/veth.c | 1 - 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index d08362e..ea1d005 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -39,16 +39,6 @@ netif_carrier_ok(dev)) /* - * Checks whether bond is ready for transmit. - * - * Caller must hold bond->lock - */ -#define BOND_IS_OK(bond) \ - (((bond)->dev->flags & IFF_UP) && \ - netif_running((bond)->dev) && \ - ((bond)->slave_cnt > 0)) - -/* * Checks whether slave is ready for transmit. */ #define SLAVE_IS_OK(slave) \ diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 3b0151a..8461576 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -22,7 +22,6 @@ #define MIN_MTU 68 /* Min L3 MTU */ #define MAX_MTU 65535 /* Max L3 MTU (arbitrary) */ -#define MTU_PAD (ETH_HLEN + 4) /* Max difference between L2 and L3 size MTU */ struct veth_net_stats { unsigned long rx_packets;