diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-31 14:46:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 14:46:45 +0200 |
| commit | 64960848abd18d0bcde3f53ffa7ed0b631e6b25d (patch) | |
| tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /net/ipv4/udp.c | |
| parent | net: fix sk_forward_alloc corruptions (diff) | |
| parent | Linux 2.6.35-rc1 (diff) | |
| download | linux-64960848abd18d0bcde3f53ffa7ed0b631e6b25d.tar.xz linux-64960848abd18d0bcde3f53ffa7ed0b631e6b25d.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index acdc9be833cc..50678f9a2763 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1690,8 +1690,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname, return -ENOPROTOOPT; if (val != 0 && val < 8) /* Illegal coverage: use default (8) */ val = 8; - else if (val > USHORT_MAX) - val = USHORT_MAX; + else if (val > USHRT_MAX) + val = USHRT_MAX; up->pcslen = val; up->pcflag |= UDPLITE_SEND_CC; break; @@ -1704,8 +1704,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname, return -ENOPROTOOPT; if (val != 0 && val < 8) /* Avoid silly minimal values. */ val = 8; - else if (val > USHORT_MAX) - val = USHORT_MAX; + else if (val > USHRT_MAX) + val = USHRT_MAX; up->pcrlen = val; up->pcflag |= UDPLITE_RECV_CC; break; |