diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 18:57:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 18:57:12 -0400 |
| commit | 03746bad30890284cc14fc39184c5b60b9cb8bc9 (patch) | |
| tree | 598728021adf309e2e46130bdef86ecf1b601054 /net/ipv6/tcp_ipv6.c | |
| parent | 719be62903a6e6419789557cb3ed0e840d3e4ca9 (diff) | |
| parent | 3f5f4346b6d3c8bc33780a941da2473c4be2c989 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[8021Q]: vlan_ioctl_handler: fix return value
[GENETLINK]: Correctly report errors while registering a multicast group
[GENETLINK]: Fix adjustment of number of multicast groups
[GENETLINK]: Fix race in genl_unregister_mc_groups()
[NETFILTER]: Clean up duplicate includes in net/netfilter/
[NETFILTER]: Clean up duplicate includes in net/bridge/
[NETFILTER]: Fix logging regression
[TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic.
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index d67fb1ef751e..f10f3689d671 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -633,6 +633,7 @@ static int tcp_v6_md5_do_del(struct sock *sk, struct in6_addr *peer) | |||
| 633 | if (tp->md5sig_info->entries6 == 0) { | 633 | if (tp->md5sig_info->entries6 == 0) { |
| 634 | kfree(tp->md5sig_info->keys6); | 634 | kfree(tp->md5sig_info->keys6); |
| 635 | tp->md5sig_info->keys6 = NULL; | 635 | tp->md5sig_info->keys6 = NULL; |
| 636 | tp->md5sig_info->alloced6 = 0; | ||
| 636 | 637 | ||
| 637 | tcp_free_md5sig_pool(); | 638 | tcp_free_md5sig_pool(); |
| 638 | 639 | ||