Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f1813bc7108811a50ff8284775ad053623903a2e..d7a884c534a6b12d7413c719a9aee3e923e28739 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2059,6 +2059,7 @@ int tcp_disconnect(struct sock *sk, int flags)
        tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
        tp->snd_cwnd_cnt = 0;
        tp->bytes_acked = 0;
+       tp->window_clamp = 0;
        tcp_set_ca_state(sk, TCP_CA_Open);
        tcp_clear_retrans(tp);
        inet_csk_delack_init(sk);

diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index faf54c6bf96bed9a25402d4ab728a21af120a207..348196df81ef8303d718a481c1238f36c9fee7ec 100644 (file)
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -365,6 +365,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 },
 {
        .name = "cbc(camellia)",
+       .compat = "camellia",
 
        .uinfo = {
                .encr = {