 +	/* Copy the vcount stamp just before where the mac/sll header wil be */
 +	ffclock_off -= sizeof(ffcounter_t);
 +	memcpy(h.raw + ffclock_off, &(skb->ffclock_stamp), sizeof(ffcounter_t));
-+#endif /* CONFIG_CONFIG */
++#endif /* CONFIG_FFCLOCK */
 +
  	__packet_set_status(po, h.raw, status);
  	smp_mb();

 
 	switch (cmd) {
 	case SIOCOUTQ:
@@ -1999,9 +2068,38 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd,
 		return put_user(amount, (int __user *)arg);
 	}
 	case SIOCGSTAMP:

 	/*
 	 * Before updating sk_refcnt, we must commit prior changes to memory
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f2d116a..ee51e00 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -84,6 +84,10 @@
