summaryrefslogtreecommitdiffstats
path: root/Documentation/networking/timestamping
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-16 00:23:54 +0100
committerDavid S. Miller <davem@davemloft.net>2010-03-16 00:23:54 +0100
commit4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch)
tree44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /Documentation/networking/timestamping
parentnet-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
downloadlinux-4961e02f1999e1c3468c09b2669c94d7c3ae82a8.tar.xz
linux-4961e02f1999e1c3468c09b2669c94d7c3ae82a8.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'Documentation/networking/timestamping')
-rw-r--r--Documentation/networking/timestamping/timestamping.c2
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)
}
sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (socket < 0)
+ if (sock < 0)
bail("socket");
memset(&device, 0, sizeof(device));