 +	/* 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 /* FFCLOCK_CONFIG */
++#endif /* CONFIG_CONFIG */
 +
  	__packet_set_status(po, h.raw, status);
  	smp_mb();
  	{
-@@ -1119,6 +1184,11 @@ static int packet_snd(struct socket *sock,
+@@ -1119,6 +1177,10 @@ static int packet_snd(struct socket *sock,
  	if (err)
  		goto out_free;
  

 	/*
 	 * 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..47eabbd 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -84,6 +84,10 @@

+	/* Pass the raw timestamp specific to the FFCLOCK to the socket */
+	sk->sk_ffclock_stamp = skb->ffclock_stamp;
+#endif
 	skb->protocol = proto;
 	skb->dev = dev;
 	skb->priority = sk->sk_priority;
@@ -1472,6 +1534,10 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
 	if (err)
 		goto out_free;
 
