diff options
author | David S. Miller | 2009-02-15 08:12:00 +0100 |
---|---|---|
committer | David S. Miller | 2009-02-15 08:12:00 +0100 |
commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /net/core | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
parent | Linux 2.6.29-rc5 (diff) | |
download | kernel-qcow2-linux-5e30589521518bff36fd2638b3c3d69679c50436.tar.gz kernel-qcow2-linux-5e30589521518bff36fd2638b3c3d69679c50436.tar.xz kernel-qcow2-linux-5e30589521518bff36fd2638b3c3d69679c50436.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index c64996f8a27a..4c64be4f8765 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -696,6 +696,8 @@ int sock_getsockopt(struct socket *sock, int level, int optname, if (len < 0) return -EINVAL; + v.val = 0; + switch(optname) { case SO_DEBUG: v.val = sock_flag(sk, SOCK_DBG); |