diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2015-01-21 18:25:46 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2015-01-21 18:25:46 +0800 |
| commit | a75a9be056d724f803263f031eeff008d8fe40d8 (patch) | |
| tree | 4b3e9f86c8447200a32967bdef27bc6d6fc2e96f /include/net | |
| parent | 6d48b36adf76c362a4b6e23ecbf23ed0dfa661a8 (diff) | |
| parent | 326dc1f1f301eaaf91619c359b85cd98c2ff4374 (diff) | |
Merge remote-tracking branch 'remotes/linaro/linux-linaro-lsk-v3.14-android' into imx_3.14.y_android_linaro
Conflicts:
Documentation/devicetree/bindings/power/power_domain.txt
drivers/base/power/domain.c
drivers/cpufreq/Kconfig
drivers/cpufreq/cpufreq_interactive.c
drivers/mmc/core/core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
include/linux/cpufreq.h
include/linux/pm_domain.h
include/trace/events/cpufreq_interactive.h
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/activity_stats.h | 25 | ||||
| -rw-r--r-- | include/net/tcp.h | 3 |
2 files changed, 28 insertions, 0 deletions
diff --git a/include/net/activity_stats.h b/include/net/activity_stats.h new file mode 100644 index 000000000000..10e4c1506eeb --- /dev/null +++ b/include/net/activity_stats.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2010 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Author: Mike Chan (mike@android.com) + */ + +#ifndef __activity_stats_h +#define __activity_stats_h + +#ifdef CONFIG_NET_ACTIVITY_STATS +void activity_stats_update(void); +#else +#define activity_stats_update(void) {} +#endif + +#endif /* _NET_ACTIVITY_STATS_H */ diff --git a/include/net/tcp.h b/include/net/tcp.h index 1f0d8479e15f..9a24f9b02e82 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -283,6 +283,7 @@ extern int sysctl_tcp_challenge_ack_limit; extern unsigned int sysctl_tcp_notsent_lowat; extern int sysctl_tcp_min_tso_segs; extern int sysctl_tcp_autocorking; +extern int sysctl_tcp_default_init_rwnd; extern atomic_long_t tcp_memory_allocated; extern struct percpu_counter tcp_sockets_allocated; @@ -1561,6 +1562,8 @@ static inline bool tcp_stream_memory_free(const struct sock *sk) return notsent_bytes < tcp_notsent_lowat(tp); } +extern int tcp_nuke_addr(struct net *net, struct sockaddr *addr); + #ifdef CONFIG_PROC_FS int tcp4_proc_init(void); void tcp4_proc_exit(void); |