Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

path: root/tstamping.h

#ifndef TSTAMPING_H
#define TSTAMPING_H

#include "config.h"

#ifdef HAVE_HARDWARE_TIMESTAMPING
extern int set_sockopt_hwtimestamp(int sock, const char *dev);
#else
static inline int set_sockopt_hwtimestamp(int sock, const char *dev)
{
	return -1;
}
#endif

#endif /* TSTAMPING_H */