%define name linux-2.6
%define module_version_varname sublevel
# 131 borrowed from centos6.1, tg3 from 220 centos 6.2
-%define taglevel 131.vs230.web10027.xidmask
+%define taglevel 131.vs230.web10027.xidmask.2
%define sublevel 33
Patch21: linux-2.6-690-web100.patch
Patch22: linux-2.6-700-bcm5720.patch
Patch23: linux-2.6-710-xidmask.patch
+Patch24: linux-2.6-720-undo-rttzero.patch
Patch10000: linux-2.6-10000-gcc-4.5.patch
Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
ApplyPatch linux-2.6-690-web100.patch
ApplyPatch linux-2.6-700-bcm5720.patch
ApplyPatch linux-2.6-710-xidmask.patch
+ApplyPatch linux-2.6-720-undo-rttzero.patch
ApplyPatch linux-2.6-10000-gcc-4.5.patch
ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch
--- /dev/null
+diff -Ndur linux-2.6.32-orig/net/ipv4/tcp_input.c linux-2.6.32-undorttzero/net/ipv4/tcp_input.c
+--- linux-2.6.32-orig/net/ipv4/tcp_input.c 2013-06-05 15:47:10.551009408 -0400
++++ linux-2.6.32-undorttzero/net/ipv4/tcp_input.c 2013-06-05 15:49:32.458996663 -0400
+@@ -5783,9 +5783,11 @@
+
+ /* tcp_ack considers this ACK as duplicate
+ * and does not calculate rtt.
+- * Force it here.
++ * Fix it at least with timestamps.
+ */
+- tcp_ack_update_rtt(sk, 0, 0);
++ if (tp->rx_opt.saw_tstamp &&
++ tp->rx_opt.rcv_tsecr && !tp->srtt)
++ tcp_ack_saw_tstamp(sk, 0);
+
+ if (tp->rx_opt.tstamp_ok)
+ tp->advmss -= TCPOLEN_TSTAMP_ALIGNED;