diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/core/sock.c | |
parent | f5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff) | |
parent | 159d83363b629c91d020734207c1bc788b96af5a (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index f2ccb1620dc4..c0ecbdcf75d8 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1746,7 +1746,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) | |||
1746 | sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; | 1746 | sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; |
1747 | sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; | 1747 | sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; |
1748 | 1748 | ||
1749 | sk->sk_stamp = ktime_set(-1L, -1L); | 1749 | sk->sk_stamp = ktime_set(-1L, 0); |
1750 | 1750 | ||
1751 | atomic_set(&sk->sk_refcnt, 1); | 1751 | atomic_set(&sk->sk_refcnt, 1); |
1752 | atomic_set(&sk->sk_drops, 0); | 1752 | atomic_set(&sk->sk_drops, 0); |