diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /net/compat.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/compat.c')
| -rw-r--r-- | net/compat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/compat.c b/net/compat.c index 8fd37cd7b501..d5d69fa15d07 100644 --- a/net/compat.c +++ b/net/compat.c | |||
| @@ -476,8 +476,7 @@ asmlinkage long compat_sys_setsockopt(int fd, int level, int optname, | |||
| 476 | int err; | 476 | int err; |
| 477 | struct socket *sock; | 477 | struct socket *sock; |
| 478 | 478 | ||
| 479 | /* SO_SET_REPLACE seems to be the same in all levels */ | 479 | if (level == SOL_IPV6 && optname == IPT_SO_SET_REPLACE) |
| 480 | if (optname == IPT_SO_SET_REPLACE) | ||
| 481 | return do_netfilter_replace(fd, level, optname, | 480 | return do_netfilter_replace(fd, level, optname, |
| 482 | optval, optlen); | 481 | optval, optlen); |
| 483 | 482 | ||