diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-31 08:46:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 08:46:45 -0400 |
| commit | 64960848abd18d0bcde3f53ffa7ed0b631e6b25d (patch) | |
| tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /net/ipv4 | |
| parent | 2903037400a26e7c0cc93ab75a7d62abfacdf485 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/ipv4')
| -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, | |||
| 1690 | return -ENOPROTOOPT; | 1690 | return -ENOPROTOOPT; |
| 1691 | if (val != 0 && val < 8) /* Illegal coverage: use default (8) */ | 1691 | if (val != 0 && val < 8) /* Illegal coverage: use default (8) */ |
| 1692 | val = 8; | 1692 | val = 8; |
| 1693 | else if (val > USHORT_MAX) | 1693 | else if (val > USHRT_MAX) |
| 1694 | val = USHORT_MAX; | 1694 | val = USHRT_MAX; |
| 1695 | up->pcslen = val; | 1695 | up->pcslen = val; |
| 1696 | up->pcflag |= UDPLITE_SEND_CC; | 1696 | up->pcflag |= UDPLITE_SEND_CC; |
| 1697 | break; | 1697 | break; |
| @@ -1704,8 +1704,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname, | |||
| 1704 | return -ENOPROTOOPT; | 1704 | return -ENOPROTOOPT; |
| 1705 | if (val != 0 && val < 8) /* Avoid silly minimal values. */ | 1705 | if (val != 0 && val < 8) /* Avoid silly minimal values. */ |
| 1706 | val = 8; | 1706 | val = 8; |
| 1707 | else if (val > USHORT_MAX) | 1707 | else if (val > USHRT_MAX) |
| 1708 | val = USHORT_MAX; | 1708 | val = USHRT_MAX; |
| 1709 | up->pcrlen = val; | 1709 | up->pcrlen = val; |
| 1710 | up->pcflag |= UDPLITE_RECV_CC; | 1710 | up->pcflag |= UDPLITE_RECV_CC; |
| 1711 | break; | 1711 | break; |