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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c

1 files changed, 162 insertions, 165 deletions

diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index e8cf99e880b0..a47a8c918ee8 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -33,20 +33,20 @@
 static int ccid2_debug;
 #define ccid2_pr_debug(format, a...)    DCCP_PR_DEBUG(ccid2_debug, format, ##a)
 
-static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
+static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hc)
 {
         int len = 0;
         int pipe = 0;
-        struct ccid2_seq *seqp = hctx->ccid2hctx_seqh;
+        struct ccid2_seq *seqp = hc->tx_seqh;
 
         /* there is data in the chain */
-        if (seqp != hctx->ccid2hctx_seqt) {
+        if (seqp != hc->tx_seqt) {
                 seqp = seqp->ccid2s_prev;
                 len++;
                 if (!seqp->ccid2s_acked)
                         pipe++;
 
-                while (seqp != hctx->ccid2hctx_seqt) {
+                while (seqp != hc->tx_seqt) {
                         struct ccid2_seq *prev = seqp->ccid2s_prev;
 
                         len++;
@@ -63,30 +63,30 @@ static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
                 }
         }
 
-        BUG_ON(pipe != hctx->ccid2hctx_pipe);
+        BUG_ON(pipe != hc->tx_pipe);
         ccid2_pr_debug("len of chain=%d\n", len);
 
         do {
                 seqp = seqp->ccid2s_prev;
                 len++;
-        } while (seqp != hctx->ccid2hctx_seqh);
+        } while (seqp != hc->tx_seqh);
 
         ccid2_pr_debug("total len=%d\n", len);
-        BUG_ON(len != hctx->ccid2hctx_seqbufc * CCID2_SEQBUF_LEN);
+        BUG_ON(len != hc->tx_seqbufc * CCID2_SEQBUF_LEN);
 }
 #else
 #define ccid2_pr_debug(format, a...)
-#define ccid2_hc_tx_check_sanity(hctx)
+#define ccid2_hc_tx_check_sanity(hc)
 #endif
 
-static int ccid2_hc_tx_alloc_seq(struct ccid2_hc_tx_sock *hctx)
+static int ccid2_hc_tx_alloc_seq(struct ccid2_hc_tx_sock *hc)
 {
         struct ccid2_seq *seqp;
         int i;
 
         /* check if we have space to preserve the pointer to the buffer */
-        if (hctx->ccid2hctx_seqbufc >= (sizeof(hctx->ccid2hctx_seqbuf) /
-                                        sizeof(struct ccid2_seq*)))
+        if (hc->tx_seqbufc >= (sizeof(hc->tx_seqbuf) /
+                               sizeof(struct ccid2_seq *)))
                 return -ENOMEM;
 
         /* allocate buffer and initialize linked list */
@@ -102,29 +102,29 @@ static int ccid2_hc_tx_alloc_seq(struct ccid2_hc_tx_sock *hctx)
         seqp->ccid2s_prev = &seqp[CCID2_SEQBUF_LEN - 1];
 
         /* This is the first allocation.  Initiate the head and tail.  */
-        if (hctx->ccid2hctx_seqbufc == 0)
-                hctx->ccid2hctx_seqh = hctx->ccid2hctx_seqt = seqp;
+        if (hc->tx_seqbufc == 0)
+                hc->tx_seqh = hc->tx_seqt = seqp;
         else {
                 /* link the existing list with the one we just created */
-                hctx->ccid2hctx_seqh->ccid2s_next = seqp;
-                seqp->ccid2s_prev = hctx->ccid2hctx_seqh;
+                hc->tx_seqh->ccid2s_next = seqp;
+                seqp->ccid2s_prev = hc->tx_seqh;
 
-                hctx->ccid2hctx_seqt->ccid2s_prev = &seqp[CCID2_SEQBUF_LEN - 1];
-                seqp[CCID2_SEQBUF_LEN - 1].ccid2s_next = hctx->ccid2hctx_seqt;
+                hc->tx_seqt->ccid2s_prev = &seqp[CCID2_SEQBUF_LEN - 1];
+                seqp[CCID2_SEQBUF_LEN - 1].ccid2s_next = hc->tx_seqt;
         }
 
         /* store the original pointer to the buffer so we can free it */
-        hctx->ccid2hctx_seqbuf[hctx->ccid2hctx_seqbufc] = seqp;
-        hctx->ccid2hctx_seqbufc++;
+        hc->tx_seqbuf[hc->tx_seqbufc] = seqp;
+        hc->tx_seqbufc++;
 
         return 0;
 }
 
 static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
 
-        if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd)
+        if (hc->tx_pipe < hc->tx_cwnd)
                 return 0;
 
         return 1; /* XXX CCID should dequeue when ready instead of polling */
@@ -133,7 +133,7 @@ static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
 static void ccid2_change_l_ack_ratio(struct sock *sk, u32 val)
 {
         struct dccp_sock *dp = dccp_sk(sk);
-        u32 max_ratio = DIV_ROUND_UP(ccid2_hc_tx_sk(sk)->ccid2hctx_cwnd, 2);
+        u32 max_ratio = DIV_ROUND_UP(ccid2_hc_tx_sk(sk)->tx_cwnd, 2);
 
         /*
          * Ensure that Ack Ratio does not exceed ceil(cwnd/2), which is (2) from
@@ -155,10 +155,10 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, u32 val)
         dp->dccps_l_ack_ratio = val;
 }
 
-static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hctx, long val)
+static void ccid2_change_srtt(struct ccid2_hc_tx_sock *hc, long val)
 {
         ccid2_pr_debug("change SRTT to %ld\n", val);
-        hctx->ccid2hctx_srtt = val;
+        hc->tx_srtt = val;
 }
 
 static void ccid2_start_rto_timer(struct sock *sk);
@@ -166,45 +166,44 @@ static void ccid2_start_rto_timer(struct sock *sk);
 static void ccid2_hc_tx_rto_expire(unsigned long data)
 {
         struct sock *sk = (struct sock *)data;
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
         long s;
 
         bh_lock_sock(sk);
         if (sock_owned_by_user(sk)) {
-                sk_reset_timer(sk, &hctx->ccid2hctx_rtotimer,
-                               jiffies + HZ / 5);
+                sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + HZ / 5);
                 goto out;
         }
 
         ccid2_pr_debug("RTO_EXPIRE\n");
 
-        ccid2_hc_tx_check_sanity(hctx);
+        ccid2_hc_tx_check_sanity(hc);
 
         /* back-off timer */
-        hctx->ccid2hctx_rto <<= 1;
+        hc->tx_rto <<= 1;
 
-        s = hctx->ccid2hctx_rto / HZ;
+        s = hc->tx_rto / HZ;
         if (s > 60)
-                hctx->ccid2hctx_rto = 60 * HZ;
+                hc->tx_rto = 60 * HZ;
 
         ccid2_start_rto_timer(sk);
 
         /* adjust pipe, cwnd etc */
-        hctx->ccid2hctx_ssthresh = hctx->ccid2hctx_cwnd / 2;
-        if (hctx->ccid2hctx_ssthresh < 2)
-                hctx->ccid2hctx_ssthresh = 2;
-        hctx->ccid2hctx_cwnd     = 1;
-        hctx->ccid2hctx_pipe     = 0;
+        hc->tx_ssthresh = hc->tx_cwnd / 2;
+        if (hc->tx_ssthresh < 2)
+                hc->tx_ssthresh = 2;
+        hc->tx_cwnd      = 1;
+        hc->tx_pipe      = 0;
 
         /* clear state about stuff we sent */
-        hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqh;
-        hctx->ccid2hctx_packets_acked = 0;
+        hc->tx_seqt = hc->tx_seqh;
+        hc->tx_packets_acked = 0;
 
         /* clear ack ratio state. */
-        hctx->ccid2hctx_rpseq    = 0;
-        hctx->ccid2hctx_rpdupack = -1;
+        hc->tx_rpseq    = 0;
+        hc->tx_rpdupack = -1;
         ccid2_change_l_ack_ratio(sk, 1);
-        ccid2_hc_tx_check_sanity(hctx);
+        ccid2_hc_tx_check_sanity(hc);
 out:
         bh_unlock_sock(sk);
         sock_put(sk);
@@ -212,42 +211,40 @@ out:
 
 static void ccid2_start_rto_timer(struct sock *sk)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
 
-        ccid2_pr_debug("setting RTO timeout=%ld\n", hctx->ccid2hctx_rto);
+        ccid2_pr_debug("setting RTO timeout=%ld\n", hc->tx_rto);
 
-        BUG_ON(timer_pending(&hctx->ccid2hctx_rtotimer));
-        sk_reset_timer(sk, &hctx->ccid2hctx_rtotimer,
-                       jiffies + hctx->ccid2hctx_rto);
+        BUG_ON(timer_pending(&hc->tx_rtotimer));
+        sk_reset_timer(sk, &hc->tx_rtotimer, jiffies + hc->tx_rto);
 }
 
 static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
 {
         struct dccp_sock *dp = dccp_sk(sk);
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
         struct ccid2_seq *next;
 
-        hctx->ccid2hctx_pipe++;
+        hc->tx_pipe++;
 
-        hctx->ccid2hctx_seqh->ccid2s_seq   = dp->dccps_gss;
-        hctx->ccid2hctx_seqh->ccid2s_acked = 0;
-        hctx->ccid2hctx_seqh->ccid2s_sent  = jiffies;
+        hc->tx_seqh->ccid2s_seq   = dp->dccps_gss;
+        hc->tx_seqh->ccid2s_acked = 0;
+        hc->tx_seqh->ccid2s_sent  = jiffies;
 
-        next = hctx->ccid2hctx_seqh->ccid2s_next;
+        next = hc->tx_seqh->ccid2s_next;
         /* check if we need to alloc more space */
-        if (next == hctx->ccid2hctx_seqt) {
-                if (ccid2_hc_tx_alloc_seq(hctx)) {
+        if (next == hc->tx_seqt) {
+                if (ccid2_hc_tx_alloc_seq(hc)) {
                         DCCP_CRIT("packet history - out of memory!");
                         /* FIXME: find a more graceful way to bail out */
                         return;
                 }
-                next = hctx->ccid2hctx_seqh->ccid2s_next;
-                BUG_ON(next == hctx->ccid2hctx_seqt);
+                next = hc->tx_seqh->ccid2s_next;
+                BUG_ON(next == hc->tx_seqt);
         }
-        hctx->ccid2hctx_seqh = next;
+        hc->tx_seqh = next;
 
-        ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd,
-                       hctx->ccid2hctx_pipe);
+        ccid2_pr_debug("cwnd=%d pipe=%d\n", hc->tx_cwnd, hc->tx_pipe);
 
         /*
          * FIXME: The code below is broken and the variables have been removed
@@ -270,12 +267,12 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
          */
 #if 0
         /* Ack Ratio.  Need to maintain a concept of how many windows we sent */
-        hctx->ccid2hctx_arsent++;
+        hc->tx_arsent++;
         /* We had an ack loss in this window... */
-        if (hctx->ccid2hctx_ackloss) {
-                if (hctx->ccid2hctx_arsent >= hctx->ccid2hctx_cwnd) {
-                        hctx->ccid2hctx_arsent  = 0;
-                        hctx->ccid2hctx_ackloss = 0;
+        if (hc->tx_ackloss) {
+                if (hc->tx_arsent >= hc->tx_cwnd) {
+                        hc->tx_arsent  = 0;
+                        hc->tx_ackloss = 0;
                 }
         } else {
                 /* No acks lost up to now... */
@@ -285,28 +282,28 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
                         int denom = dp->dccps_l_ack_ratio * dp->dccps_l_ack_ratio -
                                     dp->dccps_l_ack_ratio;
 
-                        denom = hctx->ccid2hctx_cwnd * hctx->ccid2hctx_cwnd / denom;
+                        denom = hc->tx_cwnd * hc->tx_cwnd / denom;
 
-                        if (hctx->ccid2hctx_arsent >= denom) {
+                        if (hc->tx_arsent >= denom) {
                                 ccid2_change_l_ack_ratio(sk, dp->dccps_l_ack_ratio - 1);
-                                hctx->ccid2hctx_arsent = 0;
+                                hc->tx_arsent = 0;
                         }
                 } else {
                         /* we can't increase ack ratio further [1] */
-                        hctx->ccid2hctx_arsent = 0; /* or maybe set it to cwnd*/
+                        hc->tx_arsent = 0; /* or maybe set it to cwnd*/
                 }
         }
 #endif
 
         /* setup RTO timer */
-        if (!timer_pending(&hctx->ccid2hctx_rtotimer))
+        if (!timer_pending(&hc->tx_rtotimer))
                 ccid2_start_rto_timer(sk);
 
 #ifdef CONFIG_IP_DCCP_CCID2_DEBUG
         do {
-                struct ccid2_seq *seqp = hctx->ccid2hctx_seqt;
+                struct ccid2_seq *seqp = hc->tx_seqt;
 
-                while (seqp != hctx->ccid2hctx_seqh) {
+                while (seqp != hc->tx_seqh) {
                         ccid2_pr_debug("out seq=%llu acked=%d time=%lu\n",
                                        (unsigned long long)seqp->ccid2s_seq,
                                        seqp->ccid2s_acked, seqp->ccid2s_sent);
@@ -314,7 +311,7 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
                 }
         } while (0);
         ccid2_pr_debug("=========\n");
-        ccid2_hc_tx_check_sanity(hctx);
+        ccid2_hc_tx_check_sanity(hc);
 #endif
 }
 
@@ -382,9 +379,9 @@ out_invalid_option:
 
 static void ccid2_hc_tx_kill_rto_timer(struct sock *sk)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
 
-        sk_stop_timer(sk, &hctx->ccid2hctx_rtotimer);
+        sk_stop_timer(sk, &hc->tx_rtotimer);
         ccid2_pr_debug("deleted RTO timer\n");
 }
 
@@ -392,75 +389,75 @@ static inline void ccid2_new_ack(struct sock *sk,
                                  struct ccid2_seq *seqp,
                                  unsigned int *maxincr)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
 
-        if (hctx->ccid2hctx_cwnd < hctx->ccid2hctx_ssthresh) {
-                if (*maxincr > 0 && ++hctx->ccid2hctx_packets_acked == 2) {
-                        hctx->ccid2hctx_cwnd += 1;
-                        *maxincr             -= 1;
-                        hctx->ccid2hctx_packets_acked = 0;
+        if (hc->tx_cwnd < hc->tx_ssthresh) {
+                if (*maxincr > 0 && ++hc->tx_packets_acked == 2) {
+                        hc->tx_cwnd += 1;
+                        *maxincr    -= 1;
+                        hc->tx_packets_acked = 0;
                 }
-        } else if (++hctx->ccid2hctx_packets_acked >= hctx->ccid2hctx_cwnd) {
-                        hctx->ccid2hctx_cwnd += 1;
-                        hctx->ccid2hctx_packets_acked = 0;
+        } else if (++hc->tx_packets_acked >= hc->tx_cwnd) {
+                        hc->tx_cwnd += 1;
+                        hc->tx_packets_acked = 0;
         }
 
         /* update RTO */
-        if (hctx->ccid2hctx_srtt == -1 ||
-            time_after(jiffies, hctx->ccid2hctx_lastrtt + hctx->ccid2hctx_srtt)) {
+        if (hc->tx_srtt == -1 ||
+            time_after(jiffies, hc->tx_lastrtt + hc->tx_srtt)) {
                 unsigned long r = (long)jiffies - (long)seqp->ccid2s_sent;
                 int s;
 
                 /* first measurement */
-                if (hctx->ccid2hctx_srtt == -1) {
+                if (hc->tx_srtt == -1) {
                         ccid2_pr_debug("R: %lu Time=%lu seq=%llu\n",
                                        r, jiffies,
                                        (unsigned long long)seqp->ccid2s_seq);
-                        ccid2_change_srtt(hctx, r);
-                        hctx->ccid2hctx_rttvar = r >> 1;
+                        ccid2_change_srtt(hc, r);
+                        hc->tx_rttvar = r >> 1;
                 } else {
                         /* RTTVAR */
-                        long tmp = hctx->ccid2hctx_srtt - r;
+                        long tmp = hc->tx_srtt - r;
                         long srtt;
 
                         if (tmp < 0)
                                 tmp *= -1;
 
                         tmp >>= 2;
-                        hctx->ccid2hctx_rttvar *= 3;
-                        hctx->ccid2hctx_rttvar >>= 2;
-                        hctx->ccid2hctx_rttvar += tmp;
+                        hc->tx_rttvar *= 3;
+                        hc->tx_rttvar >>= 2;
+                        hc->tx_rttvar += tmp;
 
                         /* SRTT */
-                        srtt = hctx->ccid2hctx_srtt;
+                        srtt = hc->tx_srtt;
                         srtt *= 7;
                         srtt >>= 3;
                         tmp = r >> 3;
                         srtt += tmp;
-                        ccid2_change_srtt(hctx, srtt);
+                        ccid2_change_srtt(hc, srtt);
                 }
-                s = hctx->ccid2hctx_rttvar << 2;
+                s = hc->tx_rttvar << 2;
                 /* clock granularity is 1 when based on jiffies */
                 if (!s)
                         s = 1;
-                hctx->ccid2hctx_rto = hctx->ccid2hctx_srtt + s;
+                hc->tx_rto = hc->tx_srtt + s;
 
                 /* must be at least a second */
-                s = hctx->ccid2hctx_rto / HZ;
+                s = hc->tx_rto / HZ;
                 /* DCCP doesn't require this [but I like it cuz my code sux] */
 #if 1
                 if (s < 1)
-                        hctx->ccid2hctx_rto = HZ;
+                        hc->tx_rto = HZ;
 #endif
                 /* max 60 seconds */
                 if (s > 60)
-                        hctx->ccid2hctx_rto = HZ * 60;
+                        hc->tx_rto = HZ * 60;
 
-                hctx->ccid2hctx_lastrtt = jiffies;
+                hc->tx_lastrtt = jiffies;
 
                 ccid2_pr_debug("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n",
-                               hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar,
-                               hctx->ccid2hctx_rto, HZ, r);
+                               hc->tx_srtt, hc->tx_rttvar,
+                               hc->tx_rto, HZ, r);
         }
 
         /* we got a new ack, so re-start RTO timer */
@@ -470,40 +467,40 @@ static inline void ccid2_new_ack(struct sock *sk,
 
 static void ccid2_hc_tx_dec_pipe(struct sock *sk)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
 
-        if (hctx->ccid2hctx_pipe == 0)
+        if (hc->tx_pipe == 0)
                 DCCP_BUG("pipe == 0");
         else
-                hctx->ccid2hctx_pipe--;
+                hc->tx_pipe--;
 
-        if (hctx->ccid2hctx_pipe == 0)
+        if (hc->tx_pipe == 0)
                 ccid2_hc_tx_kill_rto_timer(sk);
 }
 
 static void ccid2_congestion_event(struct sock *sk, struct ccid2_seq *seqp)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
 
-        if (time_before(seqp->ccid2s_sent, hctx->ccid2hctx_last_cong)) {
+        if (time_before(seqp->ccid2s_sent, hc->tx_last_cong)) {
                 ccid2_pr_debug("Multiple losses in an RTT---treating as one\n");
                 return;
         }
 
-        hctx->ccid2hctx_last_cong = jiffies;
+        hc->tx_last_cong = jiffies;
 
-        hctx->ccid2hctx_cwnd     = hctx->ccid2hctx_cwnd / 2 ? : 1U;
-        hctx->ccid2hctx_ssthresh = max(hctx->ccid2hctx_cwnd, 2U);
+        hc->tx_cwnd      = hc->tx_cwnd / 2 ? : 1U;
+        hc->tx_ssthresh  = max(hc->tx_cwnd, 2U);
 
         /* Avoid spurious timeouts resulting from Ack Ratio > cwnd */
-        if (dccp_sk(sk)->dccps_l_ack_ratio > hctx->ccid2hctx_cwnd)
-                ccid2_change_l_ack_ratio(sk, hctx->ccid2hctx_cwnd);
+        if (dccp_sk(sk)->dccps_l_ack_ratio > hc->tx_cwnd)
+                ccid2_change_l_ack_ratio(sk, hc->tx_cwnd);
 }
 
 static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 {
         struct dccp_sock *dp = dccp_sk(sk);
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
         u64 ackno, seqno;
         struct ccid2_seq *seqp;
         unsigned char *vector;
@@ -512,7 +509,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
         int done = 0;
         unsigned int maxincr = 0;
 
-        ccid2_hc_tx_check_sanity(hctx);
+        ccid2_hc_tx_check_sanity(hc);
         /* check reverse path congestion */
         seqno = DCCP_SKB_CB(skb)->dccpd_seq;
 
@@ -521,21 +518,21 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
          * -sorbo.
          */
         /* need to bootstrap */
-        if (hctx->ccid2hctx_rpdupack == -1) {
-                hctx->ccid2hctx_rpdupack = 0;
-                hctx->ccid2hctx_rpseq = seqno;
+        if (hc->tx_rpdupack == -1) {
+                hc->tx_rpdupack = 0;
+                hc->tx_rpseq    = seqno;
         } else {
                 /* check if packet is consecutive */
-                if (dccp_delta_seqno(hctx->ccid2hctx_rpseq, seqno) == 1)
-                        hctx->ccid2hctx_rpseq = seqno;
+                if (dccp_delta_seqno(hc->tx_rpseq, seqno) == 1)
+                        hc->tx_rpseq = seqno;
                 /* it's a later packet */
-                else if (after48(seqno, hctx->ccid2hctx_rpseq)) {
-                        hctx->ccid2hctx_rpdupack++;
+                else if (after48(seqno, hc->tx_rpseq)) {
+                        hc->tx_rpdupack++;
 
                         /* check if we got enough dupacks */
-                        if (hctx->ccid2hctx_rpdupack >= NUMDUPACK) {
-                                hctx->ccid2hctx_rpdupack = -1; /* XXX lame */
-                                hctx->ccid2hctx_rpseq = 0;
+                        if (hc->tx_rpdupack >= NUMDUPACK) {
+                                hc->tx_rpdupack = -1; /* XXX lame */
+                                hc->tx_rpseq    = 0;
 
                                 ccid2_change_l_ack_ratio(sk, 2 * dp->dccps_l_ack_ratio);
                         }
@@ -544,7 +541,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
 
         /* check forward path congestion */
         /* still didn't send out new data packets */
-        if (hctx->ccid2hctx_seqh == hctx->ccid2hctx_seqt)
+        if (hc->tx_seqh == hc->tx_seqt)
                 return;
 
         switch (DCCP_SKB_CB(skb)->dccpd_type) {
@@ -556,14 +553,14 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
         }
 
         ackno = DCCP_SKB_CB(skb)->dccpd_ack_seq;
-        if (after48(ackno, hctx->ccid2hctx_high_ack))
-                hctx->ccid2hctx_high_ack = ackno;
+        if (after48(ackno, hc->tx_high_ack))
+                hc->tx_high_ack = ackno;
 
-        seqp = hctx->ccid2hctx_seqt;
+        seqp = hc->tx_seqt;
         while (before48(seqp->ccid2s_seq, ackno)) {
                 seqp = seqp->ccid2s_next;
-                if (seqp == hctx->ccid2hctx_seqh) {
-                        seqp = hctx->ccid2hctx_seqh->ccid2s_prev;
+                if (seqp == hc->tx_seqh) {
+                        seqp = hc->tx_seqh->ccid2s_prev;
                         break;
                 }
         }
@@ -573,7 +570,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
          * packets per acknowledgement. Rounding up avoids that cwnd is not
          * advanced when Ack Ratio is 1 and gives a slight edge otherwise.
          */
-        if (hctx->ccid2hctx_cwnd < hctx->ccid2hctx_ssthresh)
+        if (hc->tx_cwnd < hc->tx_ssthresh)
                 maxincr = DIV_ROUND_UP(dp->dccps_l_ack_ratio, 2);
 
         /* go through all ack vectors */
@@ -592,7 +589,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                          * seqnos.
                          */
                         while (after48(seqp->ccid2s_seq, ackno)) {
-                                if (seqp == hctx->ccid2hctx_seqt) {
+                                if (seqp == hc->tx_seqt) {
                                         done = 1;
                                         break;
                                 }
@@ -624,7 +621,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                                                        (unsigned long long)seqp->ccid2s_seq);
                                         ccid2_hc_tx_dec_pipe(sk);
                                 }
-                                if (seqp == hctx->ccid2hctx_seqt) {
+                                if (seqp == hc->tx_seqt) {
                                         done = 1;
                                         break;
                                 }
@@ -643,11 +640,11 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
         /* The state about what is acked should be correct now
          * Check for NUMDUPACK
          */
-        seqp = hctx->ccid2hctx_seqt;
-        while (before48(seqp->ccid2s_seq, hctx->ccid2hctx_high_ack)) {
+        seqp = hc->tx_seqt;
+        while (before48(seqp->ccid2s_seq, hc->tx_high_ack)) {
                 seqp = seqp->ccid2s_next;
-                if (seqp == hctx->ccid2hctx_seqh) {
-                        seqp = hctx->ccid2hctx_seqh->ccid2s_prev;
+                if (seqp == hc->tx_seqh) {
+                        seqp = hc->tx_seqh->ccid2s_prev;
                         break;
                 }
         }
@@ -658,7 +655,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                         if (done == NUMDUPACK)
                                 break;
                 }
-                if (seqp == hctx->ccid2hctx_seqt)
+                if (seqp == hc->tx_seqt)
                         break;
                 seqp = seqp->ccid2s_prev;
         }
@@ -681,86 +678,86 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                                 ccid2_congestion_event(sk, seqp);
                                 ccid2_hc_tx_dec_pipe(sk);
                         }
-                        if (seqp == hctx->ccid2hctx_seqt)
+                        if (seqp == hc->tx_seqt)
                                 break;
                         seqp = seqp->ccid2s_prev;
                 }
 
-                hctx->ccid2hctx_seqt = last_acked;
+                hc->tx_seqt = last_acked;
         }
 
         /* trim acked packets in tail */
-        while (hctx->ccid2hctx_seqt != hctx->ccid2hctx_seqh) {
-                if (!hctx->ccid2hctx_seqt->ccid2s_acked)
+        while (hc->tx_seqt != hc->tx_seqh) {
+                if (!hc->tx_seqt->ccid2s_acked)
                         break;
 
-                hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqt->ccid2s_next;
+                hc->tx_seqt = hc->tx_seqt->ccid2s_next;
         }
 
-        ccid2_hc_tx_check_sanity(hctx);
+        ccid2_hc_tx_check_sanity(hc);
 }
 
 static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid_priv(ccid);
+        struct ccid2_hc_tx_sock *hc = ccid_priv(ccid);
         struct dccp_sock *dp = dccp_sk(sk);
         u32 max_ratio;
 
         /* RFC 4341, 5: initialise ssthresh to arbitrarily high (max) value */
-        hctx->ccid2hctx_ssthresh  = ~0U;
+        hc->tx_ssthresh = ~0U;
 
         /*
          * RFC 4341, 5: "The cwnd parameter is initialized to at most four
          * packets for new connections, following the rules from [RFC3390]".
          * We need to convert the bytes of RFC3390 into the packets of RFC 4341.
          */
-        hctx->ccid2hctx_cwnd = clamp(4380U / dp->dccps_mss_cache, 2U, 4U);
+        hc->tx_cwnd = clamp(4380U / dp->dccps_mss_cache, 2U, 4U);
 
         /* Make sure that Ack Ratio is enabled and within bounds. */
-        max_ratio = DIV_ROUND_UP(hctx->ccid2hctx_cwnd, 2);
+        max_ratio = DIV_ROUND_UP(hc->tx_cwnd, 2);
         if (dp->dccps_l_ack_ratio == 0 || dp->dccps_l_ack_ratio > max_ratio)
                 dp->dccps_l_ack_ratio = max_ratio;
 
         /* XXX init ~ to window size... */
-        if (ccid2_hc_tx_alloc_seq(hctx))
+        if (ccid2_hc_tx_alloc_seq(hc))
                 return -ENOMEM;
 
-        hctx->ccid2hctx_rto      = 3 * HZ;
-        ccid2_change_srtt(hctx, -1);
-        hctx->ccid2hctx_rttvar   = -1;
-        hctx->ccid2hctx_rpdupack = -1;
-        hctx->ccid2hctx_last_cong = jiffies;
-        setup_timer(&hctx->ccid2hctx_rtotimer, ccid2_hc_tx_rto_expire,
+        hc->tx_rto       = 3 * HZ;
+        ccid2_change_srtt(hc, -1);
+        hc->tx_rttvar    = -1;
+        hc->tx_rpdupack  = -1;
+        hc->tx_last_cong = jiffies;
+        setup_timer(&hc->tx_rtotimer, ccid2_hc_tx_rto_expire,
                         (unsigned long)sk);
 
-        ccid2_hc_tx_check_sanity(hctx);
+        ccid2_hc_tx_check_sanity(hc);
         return 0;
 }
 
 static void ccid2_hc_tx_exit(struct sock *sk)
 {
-        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
         int i;
 
         ccid2_hc_tx_kill_rto_timer(sk);
 
-        for (i = 0; i < hctx->ccid2hctx_seqbufc; i++)
-                kfree(hctx->ccid2hctx_seqbuf[i]);
-        hctx->ccid2hctx_seqbufc = 0;
+        for (i = 0; i < hc->tx_seqbufc; i++)
+                kfree(hc->tx_seqbuf[i]);
+        hc->tx_seqbufc = 0;
 }
 
 static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
 {
         const struct dccp_sock *dp = dccp_sk(sk);
-        struct ccid2_hc_rx_sock *hcrx = ccid2_hc_rx_sk(sk);
+        struct ccid2_hc_rx_sock *hc = ccid2_hc_rx_sk(sk);
 
         switch (DCCP_SKB_CB(skb)->dccpd_type) {
         case DCCP_PKT_DATA:
         case DCCP_PKT_DATAACK:
-                hcrx->ccid2hcrx_data++;
-                if (hcrx->ccid2hcrx_data >= dp->dccps_r_ack_ratio) {
+                hc->rx_data++;
+                if (hc->rx_data >= dp->dccps_r_ack_ratio) {
                         dccp_send_ack(sk);
-                        hcrx->ccid2hcrx_data = 0;
+                        hc->rx_data = 0;
                 }
                 break;
         }