mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
This commit is contained in:
commit
64960848ab
3919 changed files with 289274 additions and 121577 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue