5 files changed, 30 insertions, 23 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 99f656d35b4f..a47f5bad110d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1973,28 +1973,27 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
 
         /* make sure that we don't pick a non-existing transmit queue */
         ntxq = pkt_dev->odev->real_num_tx_queues;
-        if (ntxq <= num_online_cpus() && (pkt_dev->flags & F_QUEUE_MAP_CPU)) {
+        if (ntxq > num_online_cpus() && (pkt_dev->flags & F_QUEUE_MAP_CPU)) {
                 printk(KERN_WARNING "pktgen: WARNING: QUEUE_MAP_CPU "
-                       "disabled because CPU count (%d) exceeds number ",
-                       num_online_cpus());
-                printk(KERN_WARNING "pktgen: WARNING: of tx queues "
-                       "(%d) on %s \n", ntxq, pkt_dev->odev->name);
+                       "disabled because CPU count (%d) exceeds number "
+                       "of tx queues (%d) on %s\n", num_online_cpus(), ntxq,
+                       pkt_dev->odev->name);
                 pkt_dev->flags &= ~F_QUEUE_MAP_CPU;
         }
         if (ntxq <= pkt_dev->queue_map_min) {
                 printk(KERN_WARNING "pktgen: WARNING: Requested "
-                       "queue_map_min (%d) exceeds number of tx\n",
-                       pkt_dev->queue_map_min);
-                printk(KERN_WARNING "pktgen: WARNING: queues (%d) on "
-                       "%s, resetting\n", ntxq, pkt_dev->odev->name);
+                       "queue_map_min (zero-based) (%d) exceeds valid range "
+                       "[0 - %d] for (%d) queues on %s, resetting\n",
+                       pkt_dev->queue_map_min, (ntxq ?: 1)- 1, ntxq,
+                       pkt_dev->odev->name);
                 pkt_dev->queue_map_min = ntxq - 1;
         }
-        if (ntxq <= pkt_dev->queue_map_max) {
+        if (pkt_dev->queue_map_max >= ntxq) {
                 printk(KERN_WARNING "pktgen: WARNING: Requested "
-                       "queue_map_max (%d) exceeds number of tx\n",
-                       pkt_dev->queue_map_max);
-                printk(KERN_WARNING "pktgen: WARNING: queues (%d) on "
-                       "%s, resetting\n", ntxq, pkt_dev->odev->name);
+                       "queue_map_max (zero-based) (%d) exceeds valid range "
+                       "[0 - %d] for (%d) queues on %s, resetting\n",
+                       pkt_dev->queue_map_max, (ntxq ?: 1)- 1, ntxq,
+                       pkt_dev->odev->name);
                 pkt_dev->queue_map_max = ntxq - 1;
         }
 
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e4c5ac9fe89b..ba85d8831893 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2279,6 +2279,11 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
         }
 
         memset(&opts, 0, sizeof(opts));
+#ifdef CONFIG_SYN_COOKIES
+        if (unlikely(req->cookie_ts))
+                TCP_SKB_CB(skb)->when = cookie_init_timestamp(req);
+        else
+#endif
         TCP_SKB_CB(skb)->when = tcp_time_stamp;
         tcp_header_size = tcp_synack_options(sk, req, mss,
                                              skb, &opts, &md5) +
@@ -2304,11 +2309,6 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
 
         /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */
         th->window = htons(min(req->rcv_wnd, 65535U));
-#ifdef CONFIG_SYN_COOKIES
-        if (unlikely(req->cookie_ts))
-                TCP_SKB_CB(skb)->when = cookie_init_timestamp(req);
-        else
-#endif
         tcp_options_write((__be32 *)(th + 1), tp, &opts, &md5_hash_location);
         th->doff = (tcp_header_size >> 2);
         TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);
diff --git a/net/mac80211/rc80211_minstrel_debugfs.c b/net/mac80211/rc80211_minstrel_debugfs.c
index 0b024cd6b809..98f480708050 100644
--- a/net/mac80211/rc80211_minstrel_debugfs.c
+++ b/net/mac80211/rc80211_minstrel_debugfs.c
@@ -94,8 +94,8 @@ minstrel_stats_open(struct inode *inode, struct file *file)
                                 prob / 10, prob % 10,
                                 mr->last_success,
                                 mr->last_attempts,
-                                mr->succ_hist,
-                                mr->att_hist);
+                                (unsigned long long)mr->succ_hist,
+                                (unsigned long long)mr->att_hist);
         }
         p += sprintf(p, "\nTotal packet count::    ideal %d      "
                         "lookaround %d\n\n",
@@ -106,7 +106,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int
+static ssize_t
 minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o)
 {
         struct minstrel_stats_info *ms;
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index b9d97effebe3..defeb7a0d502 100644
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -261,6 +261,8 @@ static inline int can_respond(struct sk_buff *skb)
                 return 0; /* we are not the destination */
         if (ph->pn_res == PN_PREFIX && !pskb_may_pull(skb, 5))
                 return 0;
+        if (ph->pn_res == PN_COMMGR) /* indications */
+                return 0;
 
         ph = pn_hdr(skb); /* re-acquires the pointer */
         pm = pn_msg(skb);
@@ -309,7 +311,8 @@ static int send_reset_indications(struct sk_buff *rskb)
 
         return pn_raw_send(data, sizeof(data), rskb->dev,
                                 pn_object(oph->pn_sdev, 0x00),
-                                pn_object(oph->pn_rdev, oph->pn_robj), 0x10);
+                                pn_object(oph->pn_rdev, oph->pn_robj),
+                                PN_COMMGR);
 }
 
 
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
index 21124ec0a73d..bfdade72e066 100644
--- a/net/rfkill/rfkill-input.c
+++ b/net/rfkill/rfkill-input.c
@@ -256,6 +256,11 @@ static struct input_handler rfkill_handler = {
 
 static int __init rfkill_handler_init(void)
 {
+        unsigned long last_run = jiffies - msecs_to_jiffies(500);
+        rfkill_wlan.last = last_run;
+        rfkill_bt.last = last_run;
+        rfkill_uwb.last = last_run;
+        rfkill_wimax.last = last_run;
         return input_register_handler(&rfkill_handler);
 }