diff options
| author | Shan Wei <shanwei@cn.fujitsu.com> | 2011-05-13 21:08:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-15 18:01:15 -0400 |
| commit | 534ea99b063de7c30262a8e22f0ab44dd7d11a71 (patch) | |
| tree | b0579e32ac4151d1fc9c075de82bbae9e296c0ed | |
| parent | 3f874adc4ae80828b79e8aac6891c108c1f6be6d (diff) | |
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>
| -rw-r--r-- | drivers/net/bonding/bonding.h | 10 | ||||
| -rw-r--r-- | 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 d08362e1a0d..ea1d005be92 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 3b0151a2a31..8461576fa01 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; |