---

yaml --- r: 118891 b: refs/heads/master c: 8f7c41d h: refs/heads/master i: 118889: 0b49d7b 118887: 84585e7 v: v3
git-mirror · Nov 12, 2008 · 2176354 · 2176354
1 parent 72b6f7d
commit 2176354
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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: