1 files changed, 18 insertions, 17 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index a756847e3814..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;
         }
 
@@ -2474,7 +2473,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                                 if (ret < 0) {
                                         printk(KERN_ERR "Error expanding "
                                                "ipsec packet %d\n",ret);
-                                        return 0;
+                                        goto err;
                                 }
                         }
 
@@ -2484,8 +2483,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                         if (ret) {
                                 printk(KERN_ERR "Error creating ipsec "
                                        "packet %d\n",ret);
-                                kfree_skb(skb);
-                                return 0;
+                                goto err;
                         }
                         /* restore ll */
                         eth = (__u8 *) skb_push(skb, ETH_HLEN);
@@ -2494,6 +2492,9 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                 }
         }
         return 1;
+err:
+        kfree_skb(skb);
+        return 0;
 }
 #endif