Merge branch 'siocghwtstamp' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says: ==================== SIOCGHWTSTAMP ioctl 1. Add the SIOCGHWTSTAMP ioctl and update the timestamping documentation. 2. Implement SIOCGHWTSTAMP in most drivers that support SIOCSHWTSTAMP. 3. Add a test program to exercise SIOC{G,S}HWTSTAMP. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -26,17 +26,17 @@ enum {
|
||||
};
|
||||
|
||||
/**
|
||||
* struct hwtstamp_config - %SIOCSHWTSTAMP parameter
|
||||
* struct hwtstamp_config - %SIOCGHWTSTAMP and %SIOCSHWTSTAMP parameter
|
||||
*
|
||||
* @flags: no flags defined right now, must be zero
|
||||
* @flags: no flags defined right now, must be zero for %SIOCSHWTSTAMP
|
||||
* @tx_type: one of HWTSTAMP_TX_*
|
||||
* @rx_type: one of one of HWTSTAMP_FILTER_*
|
||||
* @rx_filter: one of HWTSTAMP_FILTER_*
|
||||
*
|
||||
* %SIOCSHWTSTAMP expects a &struct ifreq with a ifr_data pointer to
|
||||
* this structure. dev_ifsioc() in the kernel takes care of the
|
||||
* translation between 32 bit userspace and 64 bit kernel. The
|
||||
* structure is intentionally chosen so that it has the same layout on
|
||||
* 32 and 64 bit systems, don't break this!
|
||||
* %SIOCGHWTSTAMP and %SIOCSHWTSTAMP expect a &struct ifreq with a
|
||||
* ifr_data pointer to this structure. For %SIOCSHWTSTAMP, if the
|
||||
* driver or hardware does not support the requested @rx_filter value,
|
||||
* the driver may use a more general filter mode. In this case
|
||||
* @rx_filter will indicate the actual mode on return.
|
||||
*/
|
||||
struct hwtstamp_config {
|
||||
int flags;
|
||||
|
@@ -125,7 +125,8 @@
|
||||
#define SIOCBRDELIF 0x89a3 /* remove interface from bridge */
|
||||
|
||||
/* hardware time stamping: parameters in linux/net_tstamp.h */
|
||||
#define SIOCSHWTSTAMP 0x89b0
|
||||
#define SIOCSHWTSTAMP 0x89b0 /* set and get config */
|
||||
#define SIOCGHWTSTAMP 0x89b1 /* get config */
|
||||
|
||||
/* Device private ioctl calls */
|
||||
|
||||
|
Reference in New Issue
Block a user