---

yaml --- r: 247483 b: refs/heads/master c: 534ea99 h: refs/heads/master i: 247481: 267647f 247479: 710e5fc v: v3
git-mirror · May 15, 2011 · ced9bc8 · ced9bc8
1 parent 7b81690
commit ced9bc8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f874adc4ae80828b79e8aac6891c108c1f6be6d
+refs/heads/master: 534ea99b063de7c30262a8e22f0ab44dd7d11a71
diff --git a/trunk/drivers/net/bonding/bonding.h b/trunk/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/trunk/drivers/net/veth.c b/trunk/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;