diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-04-22 15:54:34 -0700 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-04-22 15:54:34 -0700 |
| commit | 2e35e1d7b965893e68f2fb1af77129406be5ff05 (patch) | |
| tree | 4133e079309e275c0aaf96461bdda21d44c59038 /include/net | |
| parent | 882113dbcbe92bca8fe08f67791e9b18d38a3fd3 (diff) | |
| parent | 438f97f7bd3127a95174ee8c36c6826bd9ba11ea (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 22c912c5dde6..0b612e7dba28 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1403,7 +1403,7 @@ extern struct sk_buff **tcp4_gro_receive(struct sk_buff **head, extern int tcp_gro_complete(struct sk_buff *skb); extern int tcp4_gro_complete(struct sk_buff *skb); -extern void tcp_v4_nuke_addr(__u32 saddr); +extern int tcp_nuke_addr(struct net *net, struct sockaddr *addr); #ifdef CONFIG_PROC_FS extern int tcp4_proc_init(void); |