mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: ax25: Fix possible oops in ax25_make_new net: restore tx timestamping for accelerated vlans Phonet: fix mutex imbalance sit: fix off-by-one in ipip6_tunnel_get_prl net: Fix sock_wfree() race net: Make setsockopt() optlen be unsigned.
This commit is contained in:
commit
817b33d38f
70 changed files with 166 additions and 166 deletions
|
|
@ -1701,7 +1701,7 @@ static void packet_flush_mclist(struct sock *sk)
|
|||
}
|
||||
|
||||
static int
|
||||
packet_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
|
||||
packet_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct packet_sock *po = pkt_sk(sk);
|
||||
|
|
|
|||
Loading…
Reference in a new issue