Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315807
b: refs/heads/master
c: 8188104
h: refs/heads/master
i:
  315805: 7ad2cb6
  315803: 006eb37
  315799: e69d822
  315791: 9c0cbaa
  315775: c209776
v: v3
  • Loading branch information
Jesper Juhl authored and David S. Miller committed Jul 23, 2012
1 parent 27b4a4b commit 313cc32
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e9965c15ba88319500284e590733f4a4629a288
refs/heads/master: 818810472b129004c16fc51bf0a570b60776bfb7
4 changes: 2 additions & 2 deletions trunk/net/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
{
struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
struct compat_cmsghdr cmhdr;
struct compat_timeval ctv;
struct compat_timespec cts[3];
int cmlen;

if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) {
Expand All @@ -229,8 +231,6 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
}

if (!COMPAT_USE_64BIT_TIME) {
struct compat_timeval ctv;
struct compat_timespec cts[3];
if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
struct timeval *tv = (struct timeval *)data;
ctv.tv_sec = tv->tv_sec;
Expand Down

0 comments on commit 313cc32

Please sign in to comment.