Merge branch 'android-3.10' into dev-kernel-3.10
Deepak Nibade [Tue, 18 Feb 2014 10:50:42 +0000 (15:50 +0530)]
Bug 1456092

Change-Id: I87b6b883c382000fc0dfee7c8d8f36269f504e46
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>

16 files changed:
1  2 
arch/arm64/kernel/entry.S
arch/arm64/mach-tegra/BoardConfig.mk
arch/arm64/mm/proc.S
drivers/cpufreq/cpufreq_interactive.c
drivers/staging/android/Kconfig
drivers/staging/android/ion/compat_ion.c
include/net/ip.h
include/net/ipv6.h
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/raw.c
net/ipv4/sysctl_net_ipv4.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/ipv4/udp.c
net/ipv6/icmp.c

Simple merge
index 0000000,0000000..689e9db
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++TARGET_USES_64_BIT_BINDER := true
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -287,7 -287,7 +287,8 @@@ extern int sysctl_tcp_thin_dupack
  extern int sysctl_tcp_early_retrans;
  extern int sysctl_tcp_limit_output_bytes;
  extern int sysctl_tcp_challenge_ack_limit;
 +extern int sysctl_tcp_min_tso_segs;
+ extern int sysctl_tcp_default_init_rwnd;
  
  extern atomic_long_t tcp_memory_allocated;
  extern struct percpu_counter tcp_sockets_allocated;
diff --cc net/ipv4/ping.c
Simple merge
diff --cc net/ipv4/raw.c
@@@ -692,8 -691,11 +692,8 @@@ static int raw_recvmsg(struct kiocb *io
        if (flags & MSG_OOB)
                goto out;
  
 -      if (addr_len)
 -              *addr_len = sizeof(*sin);
 -
        if (flags & MSG_ERRQUEUE) {
-               err = ip_recv_error(sk, msg, len, addr_len);
+               err = ip_recv_error(sk, msg, len);
                goto out;
        }
  
@@@ -754,15 -764,13 +769,22 @@@ static struct ctl_table ipv4_table[] = 
                .extra2         = &four,
        },
        {
 +              .procname       = "tcp_min_tso_segs",
 +              .data           = &sysctl_tcp_min_tso_segs,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec_minmax,
 +              .extra1         = &zero,
 +              .extra2         = &gso_max_segs,
 +      },
 +      {
+               .procname       = "tcp_default_init_rwnd",
+               .data           = &sysctl_tcp_default_init_rwnd,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_tcp_default_init_rwnd
+       },
+       {
                .procname       = "udp_mem",
                .data           = &sysctl_udp_mem,
                .maxlen         = sizeof(sysctl_udp_mem),
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
@@@ -1215,8 -1206,14 +1215,8 @@@ int udp_recvmsg(struct kiocb *iocb, str
        int is_udplite = IS_UDPLITE(sk);
        bool slow;
  
 -      /*
 -       *      Check any passed addresses
 -       */
 -      if (addr_len)
 -              *addr_len = sizeof(*sin);
 -
        if (flags & MSG_ERRQUEUE)
-               return ip_recv_error(sk, msg, len, addr_len);
+               return ip_recv_error(sk, msg, len);
  
  try_again:
        skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),
diff --cc net/ipv6/icmp.c
Simple merge