4 files changed, 23 insertions, 8 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 24e7f9ab3f5a..854d80c330ec 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3934,11 +3934,13 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                 /* Chip reset. */
                 REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
 
+                /* Reading back any register after chip reset will hang the
+                 * bus on 5706 A0 and A1.  The msleep below provides plenty
+                 * of margin for write posting.
+                 */
                 if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
-                    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
-                        current->state = TASK_UNINTERRUPTIBLE;
-                        schedule_timeout(HZ / 50);
-                }
+                    (CHIP_ID(bp) == CHIP_ID_5706_A1))
+                        msleep(20);
 
                 /* Reset takes approximate 30 usec */
                 for (i = 0; i < 10; i++) {
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index c91476ce314a..dff3192374f8 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -351,6 +351,8 @@ enum
 #define RTAX_INITCWND RTAX_INITCWND
         RTAX_FEATURES,
 #define RTAX_FEATURES RTAX_FEATURES
+        RTAX_RTO_MIN,
+#define RTAX_RTO_MIN RTAX_RTO_MIN
         __RTAX_MAX
 };
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 7bae576ac115..4ad62d375373 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3331,8 +3331,9 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
         }
 
         if ((netif_queue_stopped(odev) ||
-             netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping)) ||
-             need_resched()) {
+             (pkt_dev->skb &&
+              netif_subqueue_stopped(odev, pkt_dev->skb->queue_mapping))) ||
+            need_resched()) {
                 idle_start = getCurUs();
 
                 if (!netif_running(odev)) {
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 9785df37a65f..1ee72127462b 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -555,6 +555,16 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb)
                 tcp_grow_window(sk, skb);
 }
 
+static u32 tcp_rto_min(struct sock *sk)
+{
+        struct dst_entry *dst = __sk_dst_get(sk);
+        u32 rto_min = TCP_RTO_MIN;
+
+        if (dst_metric_locked(dst, RTAX_RTO_MIN))
+                rto_min = dst->metrics[RTAX_RTO_MIN-1];
+        return rto_min;
+}
+
 /* Called to compute a smoothed rtt estimate. The data fed to this
  * routine either comes from timestamps, or from segments that were
  * known _not_ to have been retransmitted [see Karn/Partridge
@@ -616,13 +626,13 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
                         if (tp->mdev_max < tp->rttvar)
                                 tp->rttvar -= (tp->rttvar-tp->mdev_max)>>2;
                         tp->rtt_seq = tp->snd_nxt;
-                        tp->mdev_max = TCP_RTO_MIN;
+                        tp->mdev_max = tcp_rto_min(sk);
                 }
         } else {
                 /* no previous measure. */
                 tp->srtt = m<<3;        /* take the measured time to be rtt */
                 tp->mdev = m<<1;        /* make sure rto = 3*rtt */
-                tp->mdev_max = tp->rttvar = max(tp->mdev, TCP_RTO_MIN);
+                tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk));
                 tp->rtt_seq = tp->snd_nxt;
         }
 }