diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 23:45:17 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 23:45:17 +0100 |
commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
tree | 92586df0daf3298262a957640e5c86679c963f41 /Documentation/networking/timestamping/timestamping.c | |
parent | nfsd41: use sv_max_mesg for forechannel max sizes (diff) | |
parent | Linux 2.6.32-rc5 (diff) | |
download | linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'Documentation/networking/timestamping/timestamping.c')
-rw-r--r-- | Documentation/networking/timestamping/timestamping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/timestamping/timestamping.c b/Documentation/networking/timestamping/timestamping.c index 43d143104210..a7936fe8444a 100644 --- a/Documentation/networking/timestamping/timestamping.c +++ b/Documentation/networking/timestamping/timestamping.c @@ -381,7 +381,7 @@ int main(int argc, char **argv) memset(&hwtstamp, 0, sizeof(hwtstamp)); strncpy(hwtstamp.ifr_name, interface, sizeof(hwtstamp.ifr_name)); hwtstamp.ifr_data = (void *)&hwconfig; - memset(&hwconfig, 0, sizeof(&hwconfig)); + memset(&hwconfig, 0, sizeof(hwconfig)); hwconfig.tx_type = (so_timestamping_flags & SOF_TIMESTAMPING_TX_HARDWARE) ? HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF; |