diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /Documentation/networking/timestamping | |
| parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'Documentation/networking/timestamping')
| -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 7b81d169cb0f..8ba82bfe6a33 100644 --- a/Documentation/networking/timestamping/timestamping.c +++ b/Documentation/networking/timestamping/timestamping.c | |||
| @@ -370,7 +370,7 @@ int main(int argc, char **argv) | |||
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); | 372 | sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); |
| 373 | if (socket < 0) | 373 | if (sock < 0) |
| 374 | bail("socket"); | 374 | bail("socket"); |
| 375 | 375 | ||
| 376 | memset(&device, 0, sizeof(device)); | 376 | memset(&device, 0, sizeof(device)); |