---

yaml --- r: 155662 b: refs/heads/master c: f249fb7 h: refs/heads/master v: v3
git-mirror · Jul 20, 2009 · 7e93315 · 7e93315
1 parent 6100b61
commit 7e93315
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4135c2da11c337e3759f98727c4819ba2a849fa
+refs/heads/master: f249fb783092471a4808e5fc5bda071d2724810d
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -631,7 +631,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 
 	case SO_TIMESTAMPING:
 		if (val & ~SOF_TIMESTAMPING_MASK) {
-			ret = EINVAL;
+			ret = -EINVAL;
 			break;
 		}
 		sock_valbool_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE,