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.

diff --combined net/packet/af_packet.c
index 103d561,1238949..d7ecca0
--- 1/net/packet/af_packet.c
--- 2/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@@ -1701,7 -1701,7 +1701,7 @@@ static void packet_flush_mclist(struct 
  }
  
  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);
@@@ -2084,7 -2084,7 +2084,7 @@@ static void packet_mm_close(struct vm_a
                atomic_dec(&pkt_sk(sk)->mapped);
  }
  
 -static struct vm_operations_struct packet_mmap_ops = {
 +static const struct vm_operations_struct packet_mmap_ops = {
        .open   =       packet_mm_open,
        .close  =       packet_mm_close,
  };