Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

3 files changed, 49 insertions, 33 deletions

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 861978a4f1a8..cfb38ac9d698 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -209,9 +209,17 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
 
                 hash = protocol & (MAX_INET_PROTOS - 1);
                 ipprot = rcu_dereference(inet_protos[hash]);
-                if (ipprot != NULL && (net == &init_net || ipprot->netns_ok)) {
+                if (ipprot != NULL) {
                         int ret;
 
+                        if (!net_eq(net, &init_net) && !ipprot->netns_ok) {
+                                if (net_ratelimit())
+                                        printk("%s: proto %d isn't netns-ready\n",
+                                                __func__, protocol);
+                                kfree_skb(skb);
+                                goto out;
+                        }
+
                         if (!ipprot->no_policy) {
                                 if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
                                         kfree_skb(skb);
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 8f5a403f6f6b..a631a1f110ca 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -237,43 +237,45 @@ static const struct snmp_mib snmp4_net_list[] = {
         SNMP_MIB_SENTINEL
 };
 
+static void icmpmsg_put_line(struct seq_file *seq, unsigned long *vals,
+                             unsigned short *type, int count)
+{
+        int j;
+
+        if (count) {
+                seq_printf(seq, "\nIcmpMsg:");
+                for (j = 0; j < count; ++j)
+                        seq_printf(seq, " %sType%u",
+                                type[j] & 0x100 ? "Out" : "In",
+                                type[j] & 0xff);
+                seq_printf(seq, "\nIcmpMsg:");
+                for (j = 0; j < count; ++j)
+                        seq_printf(seq, " %lu", vals[j]);
+        }
+}
+
 static void icmpmsg_put(struct seq_file *seq)
 {
 #define PERLINE 16
 
-        int j, i, count;
-        static int out[PERLINE];
+        int i, count;
+        unsigned short type[PERLINE];
+        unsigned long vals[PERLINE], val;
         struct net *net = seq->private;
 
         count = 0;
         for (i = 0; i < ICMPMSG_MIB_MAX; i++) {
-
-                if (snmp_fold_field((void **) net->mib.icmpmsg_statistics, i))
-                        out[count++] = i;
-                if (count < PERLINE)
-                        continue;
-
-                seq_printf(seq, "\nIcmpMsg:");
-                for (j = 0; j < PERLINE; ++j)
-                        seq_printf(seq, " %sType%u", i & 0x100 ? "Out" : "In",
-                                        i & 0xff);
-                seq_printf(seq, "\nIcmpMsg: ");
-                for (j = 0; j < PERLINE; ++j)
-                        seq_printf(seq, " %lu",
-                                snmp_fold_field((void **) net->mib.icmpmsg_statistics,
-                                out[j]));
-                seq_putc(seq, '\n');
-        }
-        if (count) {
-                seq_printf(seq, "\nIcmpMsg:");
-                for (j = 0; j < count; ++j)
-                        seq_printf(seq, " %sType%u", out[j] & 0x100 ? "Out" :
-                                "In", out[j] & 0xff);
-                seq_printf(seq, "\nIcmpMsg:");
-                for (j = 0; j < count; ++j)
-                        seq_printf(seq, " %lu", snmp_fold_field((void **)
-                                net->mib.icmpmsg_statistics, out[j]));
+                val = snmp_fold_field((void **) net->mib.icmpmsg_statistics, i);
+                if (val) {
+                        type[count] = i;
+                        vals[count++] = val;
+                }
+                if (count == PERLINE) {
+                        icmpmsg_put_line(seq, vals, type, count);
+                        count = 0;
+                }
         }
+        icmpmsg_put_line(seq, vals, type, count);
 
 #undef PERLINE
 }
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index af99776146ff..937549b8a921 100644
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -69,9 +69,12 @@ static u32 htcp_cwnd_undo(struct sock *sk)
         const struct tcp_sock *tp = tcp_sk(sk);
         struct htcp *ca = inet_csk_ca(sk);
 
-        ca->last_cong = ca->undo_last_cong;
-        ca->maxRTT = ca->undo_maxRTT;
-        ca->old_maxB = ca->undo_old_maxB;
+        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;
+        }
 
         return max(tp->snd_cwnd, (tp->snd_ssthresh << 7) / ca->beta);
 }
@@ -268,7 +271,10 @@ static void htcp_state(struct sock *sk, u8 new_state)
         case TCP_CA_Open:
                 {
                         struct htcp *ca = inet_csk_ca(sk);
-                        ca->last_cong = jiffies;
+                        if (ca->undo_last_cong) {
+                                ca->last_cong = jiffies;
+                                ca->undo_last_cong = 0;
+                        }
                 }
                 break;
         case TCP_CA_CWR: