* [PATCH net-next] net: drivers: kill two unused macro definitions
@ 2011-05-14 7:08 Shan Wei
2011-05-14 7:53 ` Jiri Pirko
0 siblings, 1 reply; 3+ messages in thread
From: Shan Wei @ 2011-05-14 7:08 UTC (permalink / raw)
To: fubar, andy, David Miller, jpirko, Michał Mirosław
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
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;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: drivers: kill two unused macro definitions
2011-05-14 7:08 [PATCH net-next] net: drivers: kill two unused macro definitions Shan Wei
@ 2011-05-14 7:53 ` Jiri Pirko
2011-05-15 22:01 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Pirko @ 2011-05-14 7:53 UTC (permalink / raw)
To: Shan Wei
Cc: fubar, andy, David Miller, Michał Mirosław,
Eric Dumazet, ebiederm, netdev
Sat, May 14, 2011 at 09:08:47AM CEST, shanwei@cn.fujitsu.com wrote:
>
>
>Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
>---
> 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;
>--
>1.7.4.1
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: drivers: kill two unused macro definitions
2011-05-14 7:53 ` Jiri Pirko
@ 2011-05-15 22:01 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2011-05-15 22:01 UTC (permalink / raw)
To: jpirko; +Cc: shanwei, fubar, andy, mirq-linux, eric.dumazet, ebiederm, netdev
From: Jiri Pirko <jpirko@redhat.com>
Date: Sat, 14 May 2011 09:53:35 +0200
> Sat, May 14, 2011 at 09:08:47AM CEST, shanwei@cn.fujitsu.com wrote:
>>
>>
>>Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
...
> Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-15 22:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-14 7:08 [PATCH net-next] net: drivers: kill two unused macro definitions Shan Wei
2011-05-14 7:53 ` Jiri Pirko
2011-05-15 22:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).