Patchwork [net-next] net: drivers: kill two unused macro definitions

login
register
mail settings
Submitter Shan Wei
Date May 14, 2011, 7:08 a.m.
Message ID <4DCE2A7F.1040000@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/95546/
State Accepted
Delegated to: David Miller
Headers show

Comments

Shan Wei - May 14, 2011, 7:08 a.m.
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(-)
Jiri Pirko - May 14, 2011, 7:53 a.m.
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>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - May 15, 2011, 10:01 p.m.
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;