From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Fri, 13 May 2011 21:08:47 +0000 (+0000)
Subject: net: drivers: kill two unused macro definitions
X-Git-Tag: v3.0-rc1~377^2~63
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=534ea99b063de7c30262a8e22f0ab44dd7d11a71;p=karo-tx-linux.git

net: drivers: kill two unused macro definitions

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index d08362e1a0dd..ea1d005be92d 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -38,16 +38,6 @@
 	       netif_running(dev)			&& \
 	       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.
  */
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 3b0151a2a31b..8461576fa015 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;