Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [DCCP]: Set RTO for newly created child socket
  [DCCP]: Correctly split CCID half connections
  [NET]: Fix compat_sock_common_getsockopt typo.
  [NET]: Revert incorrect accept queue backlog changes.
  [INET]: twcal_jiffie should be unsigned long, not int
  [GIANFAR]: Fix compile error in latest git
  [PPPOE]: Use ifindex instead of device pointer in key lookups.
  [NETFILTER]: ip6_route_me_harder should take into account mark
  [NETFILTER]: nfnetlink_log: fix reference counting
  [NETFILTER]: nfnetlink_log: fix module reference counting
  [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
  [NETFILTER]: nfnetlink_log: fix NULL pointer dereference
  [NETFILTER]: nfnetlink_log: fix use after free
  [NETFILTER]: nfnetlink_log: fix reference leak
  [NETFILTER]: tcp conntrack: accept SYN|URG as valid
  [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
  [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops

1 files changed, 6 insertions, 6 deletions

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 4dee462f00db..287099f7f042 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -256,10 +256,10 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
          *        (only one is active at a time); when moving to bidirectional
          *        service, this needs to be revised.
          */
-        if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)
-                ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-        else
+        if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
                 ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+        else    /* listening or connected server */
+                ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
 
         return __dccp_rcv_established(sk, skb, dh, len);
 discard:
@@ -495,10 +495,10 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                         goto discard;
 
                 /* XXX see the comments in dccp_rcv_established about this */
-                if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)
-                        ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
-                else
+                if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)
                         ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);
+                else
+                        ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);
         }
 
         /*