diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-25 14:42:58 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-25 14:42:58 +0530 |
| commit | ed22062df7ae836e674c01f69e8567ad51ba31b1 (patch) | |
| tree | 32972feea81e770d650a3dc7d36907a7c49f9d4d /include/net | |
| parent | 90651aad036485974b99101df66a50e57c19e732 (diff) | |
| parent | 2e35e1d7b965893e68f2fb1af77129406be5ff05 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mm/proc-v7.S
drivers/video/tegra/dc/dc.c
Change-Id: I40be0d615f14f1c01305388a706d257f624ba968
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); |