Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 3d72dc43dca5..ac4a92e08c09 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -262,6 +262,7 @@ extern const char gfar_driver_version[];
 
 #define next_bd(bdp, base, ring_size) skip_bd(bdp, 1, base, ring_size)
 
+#define RCTRL_TS_ENABLE         0x01000000
 #define RCTRL_PAL_MASK          0x001f0000
 #define RCTRL_VLEX              0x00002000
 #define RCTRL_FILREN            0x00001000
@@ -539,7 +540,7 @@ struct txbd8
 
 struct txfcb {
         u8      flags;
-        u8      reserved;
+        u8      ptp;    /* Flag to enable tx timestamping */
         u8      l4os;   /* Level 4 Header Offset */
         u8      l3os;   /* Level 3 Header Offset */
         u16     phcs;   /* Pseudo-header Checksum */
@@ -566,6 +567,12 @@ struct rxfcb {
         u16     vlctl;  /* VLAN control word */
 };
 
+struct gianfar_skb_cb {
+        int alignamount;
+};
+
+#define GFAR_CB(skb) ((struct gianfar_skb_cb *)((skb)->cb))
+
 struct rmon_mib
 {
         u32     tr64;   /* 0x.680 - Transmit and Receive 64-byte Frame Counter */
@@ -879,6 +886,7 @@ struct gfar {
 #define FSL_GIANFAR_DEV_HAS_MAGIC_PACKET        0x00000100
 #define FSL_GIANFAR_DEV_HAS_BD_STASHING         0x00000200
 #define FSL_GIANFAR_DEV_HAS_BUF_STASHING        0x00000400
+#define FSL_GIANFAR_DEV_HAS_TIMER               0x00000800
 
 #if (MAXGROUPS == 2)
 #define DEFAULT_MAPPING         0xAA
@@ -1094,6 +1102,10 @@ struct gfar_private {
 
         /* Network Statistics */
         struct gfar_extra_stats extra_stats;
+
+        /* HW time stamping enabled flag */
+        int hwts_rx_en;
+        int hwts_tx_en;
 };
 
 extern unsigned int ftp_rqfpr[MAX_FILER_IDX + 1];