diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2011-05-13 17:08:47 -0400 |
---|---|---|
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 d08362e1a0dd..ea1d005be92d 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -39,16 +39,6 @@ | |||
39 | netif_carrier_ok(dev)) | 39 | netif_carrier_ok(dev)) |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * Checks whether bond is ready for transmit. | ||
43 | * | ||
44 | * Caller must hold bond->lock | ||
45 | */ | ||
46 | #define BOND_IS_OK(bond) \ | ||
47 | (((bond)->dev->flags & IFF_UP) && \ | ||
48 | netif_running((bond)->dev) && \ | ||
49 | ((bond)->slave_cnt > 0)) | ||
50 | |||
51 | /* | ||
52 | * Checks whether slave is ready for transmit. | 42 | * Checks whether slave is ready for transmit. |
53 | */ | 43 | */ |
54 | #define SLAVE_IS_OK(slave) \ | 44 | #define SLAVE_IS_OK(slave) \ |
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 @@ | |||
22 | 22 | ||
23 | #define MIN_MTU 68 /* Min L3 MTU */ | 23 | #define MIN_MTU 68 /* Min L3 MTU */ |
24 | #define MAX_MTU 65535 /* Max L3 MTU (arbitrary) */ | 24 | #define MAX_MTU 65535 /* Max L3 MTU (arbitrary) */ |
25 | #define MTU_PAD (ETH_HLEN + 4) /* Max difference between L2 and L3 size MTU */ | ||
26 | 25 | ||
27 | struct veth_net_stats { | 26 | struct veth_net_stats { |
28 | unsigned long rx_packets; | 27 | unsigned long rx_packets; |