From 217635408398915e837839776d5746c5238f9fe4 Mon Sep 17 00:00:00 2001
From: Ivan Kuten <ivan.kuten@promwad.com>
Date: Mon, 10 Nov 2008 19:39:25 -0600
Subject: [PATCH] --- yaml --- r: 118891 b: refs/heads/master c:
 8f7c41d4cec91cdbfa89b4a77d5a628938875366 h: refs/heads/master i:   118889:
 0b49d7bca5594615b970d3159965c46cf57a15c1   118887:
 84585e7884c5f6f0ad7825278fd0e62e33f839f4 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/net/niu.c                  |  3 ++-
 trunk/drivers/net/wireless/rtl8187_dev.c |  2 ++
 trunk/net/compat.c                       |  4 ++--
 trunk/net/ipv4/tcp_htcp.c                | 14 ++++----------
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d7ced117a6bf..f2d7b6904a09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e23a59e1ca6d177a57a7791b3629db93ff1d9813
+refs/heads/master: 8f7c41d4cec91cdbfa89b4a77d5a628938875366
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index d8463b1c3df3..9acb5d70a3ae 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -51,7 +51,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);
 #ifndef readq
 static u64 readq(void __iomem *reg)
 {
-	return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
+	return (((u64)readl(reg + 0x4UL) << 32) |
+		(u64)readl(reg));
 }
 
 static void writeq(u64 val, void __iomem *reg)
diff --git a/trunk/drivers/net/wireless/rtl8187_dev.c b/trunk/drivers/net/wireless/rtl8187_dev.c
index 431e3c78bf27..0ce9fb037950 100644
--- a/trunk/drivers/net/wireless/rtl8187_dev.c
+++ b/trunk/drivers/net/wireless/rtl8187_dev.c
@@ -48,6 +48,8 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
 	{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},
 	/* Sitecom */
 	{USB_DEVICE(0x0df6, 0x000d), .driver_info = DEVICE_RTL8187},
+	/* Abocom */
+	{USB_DEVICE(0x13d1, 0xabe6), .driver_info = DEVICE_RTL8187},
 	{}
 };
 
diff --git a/trunk/net/compat.c b/trunk/net/compat.c
index 6ce1a1cadcc0..67fb6a3834a3 100644
--- a/trunk/net/compat.c
+++ b/trunk/net/compat.c
@@ -226,14 +226,14 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
 		return 0; /* XXX: return error? check spec. */
 	}
 
-	if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
+	if (level == SOL_SOCKET && type == SO_TIMESTAMP) {
 		struct timeval *tv = (struct timeval *)data;
 		ctv.tv_sec = tv->tv_sec;
 		ctv.tv_usec = tv->tv_usec;
 		data = &ctv;
 		len = sizeof(ctv);
 	}
-	if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS) {
+	if (level == SOL_SOCKET && type == SO_TIMESTAMPNS) {
 		struct timespec *ts = (struct timespec *)data;
 		cts.tv_sec = ts->tv_sec;
 		cts.tv_nsec = ts->tv_nsec;
diff --git a/trunk/net/ipv4/tcp_htcp.c b/trunk/net/ipv4/tcp_htcp.c
index 937549b8a921..af99776146ff 100644
--- a/trunk/net/ipv4/tcp_htcp.c
+++ b/trunk/net/ipv4/tcp_htcp.c
@@ -69,12 +69,9 @@ static u32 htcp_cwnd_undo(struct sock *sk)
 	const struct tcp_sock *tp = tcp_sk(sk);
 	struct htcp *ca = inet_csk_ca(sk);
 
-	if (ca->undo_last_cong) {
-		ca->last_cong = ca->undo_last_cong;
-		ca->maxRTT = ca->undo_maxRTT;
-		ca->old_maxB = ca->undo_old_maxB;
-		ca->undo_last_cong = 0;
-	}
+	ca->last_cong = ca->undo_last_cong;
+	ca->maxRTT = ca->undo_maxRTT;
+	ca->old_maxB = ca->undo_old_maxB;
 
 	return max(tp->snd_cwnd, (tp->snd_ssthresh << 7) / ca->beta);
 }
@@ -271,10 +268,7 @@ static void htcp_state(struct sock *sk, u8 new_state)
 	case TCP_CA_Open:
 		{
 			struct htcp *ca = inet_csk_ca(sk);
-			if (ca->undo_last_cong) {
-				ca->last_cong = jiffies;
-				ca->undo_last_cong = 0;
-			}
+			ca->last_cong = jiffies;
 		}
 		break;
 	case TCP_CA_CWR: