Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-drm-fsl-dcu.git] / net / core / pktgen.c

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index b81369b6ddc06e1056e8d3283241ff7d56b27fa6..cce9e53528b169a67a8b5cd8bf0e568460587e24 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -320,7 +320,7 @@ struct pktgen_dev {
                                (see RFC 3260, sec. 4) */
 
        /* MPLS */
-       unsigned nr_labels;     /* Depth of stack, 0 = no MPLS */
+       unsigned int nr_labels; /* Depth of stack, 0 = no MPLS */
        __be32 labels[MAX_MPLS_LABELS];
 
        /* VLAN/SVLAN (802.1Q/Q-in-Q) */
@@ -373,10 +373,10 @@ struct pktgen_dev {
                                  */
        char odevname[32];
        struct flow_state *flows;
-       unsigned cflows;        /* Concurrent flows (config) */
-       unsigned lflow;         /* Flow length  (config) */
-       unsigned nflows;        /* accumulated flows (stats) */
-       unsigned curfl;         /* current sequenced flow (state)*/
+       unsigned int cflows;    /* Concurrent flows (config) */
+       unsigned int lflow;             /* Flow length  (config) */
+       unsigned int nflows;    /* accumulated flows (stats) */
+       unsigned int curfl;             /* current sequenced flow (state)*/
 
        u16 queue_map_min;
        u16 queue_map_max;
@@ -592,7 +592,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
                   pkt_dev->src_mac_count, pkt_dev->dst_mac_count);
 
        if (pkt_dev->nr_labels) {
-               unsigned i;
+               unsigned int i;
                seq_printf(seq, "     mpls: ");
                for (i = 0; i < pkt_dev->nr_labels; i++)
                        seq_printf(seq, "%08x%s", ntohl(pkt_dev->labels[i]),
@@ -812,7 +812,7 @@ done_str:
 
 static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev)
 {
-       unsigned n = 0;
+       unsigned int n = 0;
        char c;
        ssize_t i = 0;
        int len;
@@ -891,8 +891,8 @@ static ssize_t pktgen_if_write(struct file *file,
                if (copy_from_user(tb, user_buffer, copy))
                        return -EFAULT;
                tb[copy] = 0;
-               printk(KERN_DEBUG "pktgen: %s,%lu  buffer -:%s:-\n", name,
-                      (unsigned long)count, tb);
+               pr_debug("%s,%lu  buffer -:%s:-\n",
+                        name, (unsigned long)count, tb);
        }
 
        if (!strcmp(name, "min_pkt_size")) {
@@ -1261,8 +1261,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->cur_daddr = pkt_dev->daddr_min;
                }
                if (debug)
-                       printk(KERN_DEBUG "pktgen: dst_min set to: %s\n",
-                              pkt_dev->dst_min);
+                       pr_debug("dst_min set to: %s\n", pkt_dev->dst_min);
                i += len;
                sprintf(pg_result, "OK: dst_min=%s", pkt_dev->dst_min);
                return count;
@@ -1284,8 +1283,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->cur_daddr = pkt_dev->daddr_max;
                }
                if (debug)
-                       printk(KERN_DEBUG "pktgen: dst_max set to: %s\n",
-                              pkt_dev->dst_max);
+                       pr_debug("dst_max set to: %s\n", pkt_dev->dst_max);
                i += len;
                sprintf(pg_result, "OK: dst_max=%s", pkt_dev->dst_max);
                return count;
@@ -1307,7 +1305,7 @@ static ssize_t pktgen_if_write(struct file *file,
                pkt_dev->cur_in6_daddr = pkt_dev->in6_daddr;
 
                if (debug)
-                       printk(KERN_DEBUG "pktgen: dst6 set to: %s\n", buf);
+                       pr_debug("dst6 set to: %s\n", buf);
 
                i += len;
                sprintf(pg_result, "OK: dst6=%s", buf);
@@ -1329,7 +1327,7 @@ static ssize_t pktgen_if_write(struct file *file,
 
                pkt_dev->cur_in6_daddr = pkt_dev->min_in6_daddr;
                if (debug)
-                       printk(KERN_DEBUG "pktgen: dst6_min set to: %s\n", buf);
+                       pr_debug("dst6_min set to: %s\n", buf);
 
                i += len;
                sprintf(pg_result, "OK: dst6_min=%s", buf);
@@ -1350,7 +1348,7 @@ static ssize_t pktgen_if_write(struct file *file,
                snprintf(buf, sizeof(buf), "%pI6c", &pkt_dev->max_in6_daddr);
 
                if (debug)
-                       printk(KERN_DEBUG "pktgen: dst6_max set to: %s\n", buf);
+                       pr_debug("dst6_max set to: %s\n", buf);
 
                i += len;
                sprintf(pg_result, "OK: dst6_max=%s", buf);
@@ -1373,7 +1371,7 @@ static ssize_t pktgen_if_write(struct file *file,
                pkt_dev->cur_in6_saddr = pkt_dev->in6_saddr;
 
                if (debug)
-                       printk(KERN_DEBUG "pktgen: src6 set to: %s\n", buf);
+                       pr_debug("src6 set to: %s\n", buf);
 
                i += len;
                sprintf(pg_result, "OK: src6=%s", buf);
@@ -1394,8 +1392,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->cur_saddr = pkt_dev->saddr_min;
                }
                if (debug)
-                       printk(KERN_DEBUG "pktgen: src_min set to: %s\n",
-                              pkt_dev->src_min);
+                       pr_debug("src_min set to: %s\n", pkt_dev->src_min);
                i += len;
                sprintf(pg_result, "OK: src_min=%s", pkt_dev->src_min);
                return count;
@@ -1415,8 +1412,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->cur_saddr = pkt_dev->saddr_max;
                }
                if (debug)
-                       printk(KERN_DEBUG "pktgen: src_max set to: %s\n",
-                              pkt_dev->src_max);
+                       pr_debug("src_max set to: %s\n", pkt_dev->src_max);
                i += len;
                sprintf(pg_result, "OK: src_max=%s", pkt_dev->src_max);
                return count;
@@ -1510,7 +1506,7 @@ static ssize_t pktgen_if_write(struct file *file,
        }
 
        if (!strcmp(name, "mpls")) {
-               unsigned n, cnt;
+               unsigned int n, cnt;
 
                len = get_labels(&user_buffer[i], pkt_dev);
                if (len < 0)
@@ -1527,7 +1523,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->svlan_id = 0xffff;
 
                        if (debug)
-                               printk(KERN_DEBUG "pktgen: VLAN/SVLAN auto turned off\n");
+                               pr_debug("VLAN/SVLAN auto turned off\n");
                }
                return count;
        }
@@ -1542,10 +1538,10 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->vlan_id = value;  /* turn on VLAN */
 
                        if (debug)
-                               printk(KERN_DEBUG "pktgen: VLAN turned on\n");
+                               pr_debug("VLAN turned on\n");
 
                        if (debug && pkt_dev->nr_labels)
-                               printk(KERN_DEBUG "pktgen: MPLS auto turned off\n");
+                               pr_debug("MPLS auto turned off\n");
 
                        pkt_dev->nr_labels = 0;    /* turn off MPLS */
                        sprintf(pg_result, "OK: vlan_id=%u", pkt_dev->vlan_id);
@@ -1554,7 +1550,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->svlan_id = 0xffff;
 
                        if (debug)
-                               printk(KERN_DEBUG "pktgen: VLAN/SVLAN turned off\n");
+                               pr_debug("VLAN/SVLAN turned off\n");
                }
                return count;
        }
@@ -1599,10 +1595,10 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->svlan_id = value;  /* turn on SVLAN */
 
                        if (debug)
-                               printk(KERN_DEBUG "pktgen: SVLAN turned on\n");
+                               pr_debug("SVLAN turned on\n");
 
                        if (debug && pkt_dev->nr_labels)
-                               printk(KERN_DEBUG "pktgen: MPLS auto turned off\n");
+                               pr_debug("MPLS auto turned off\n");
 
                        pkt_dev->nr_labels = 0;    /* turn off MPLS */
                        sprintf(pg_result, "OK: svlan_id=%u", pkt_dev->svlan_id);
@@ -1611,7 +1607,7 @@ static ssize_t pktgen_if_write(struct file *file,
                        pkt_dev->svlan_id = 0xffff;
 
                        if (debug)
-                               printk(KERN_DEBUG "pktgen: VLAN/SVLAN turned off\n");
+                               pr_debug("VLAN/SVLAN turned off\n");
                }
                return count;
        }
@@ -1779,8 +1775,7 @@ static ssize_t pktgen_thread_write(struct file *file,
        i += len;
 
        if (debug)
-               printk(KERN_DEBUG "pktgen: t=%s, count=%lu\n",
-                      name, (unsigned long)count);
+               pr_debug("t=%s, count=%lu\n", name, (unsigned long)count);
 
        if (!t) {
                pr_err("ERROR: No thread\n");
@@ -2324,7 +2319,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
        }
 
        if (pkt_dev->flags & F_MPLS_RND) {
-               unsigned i;
+               unsigned int i;
                for (i = 0; i < pkt_dev->nr_labels; i++)
                        if (pkt_dev->labels[i] & MPLS_STACK_BOTTOM)
                                pkt_dev->labels[i] = MPLS_STACK_BOTTOM |
@@ -2550,7 +2545,7 @@ err:
 
 static void mpls_push(__be32 *mpls, struct pktgen_dev *pkt_dev)
 {
-       unsigned i;
+       unsigned int i;
        for (i = 0; i < pkt_dev->nr_labels; i++)
                *mpls++ = pkt_dev->labels[i] & ~MPLS_STACK_BOTTOM;
 
@@ -2934,8 +2929,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
 
        if (datalen < sizeof(struct pktgen_hdr)) {
                datalen = sizeof(struct pktgen_hdr);
-               if (net_ratelimit())
-                       pr_info("increased datalen to %d\n", datalen);
+               net_info_ratelimited("increased datalen to %d\n", datalen);
        }
 
        udph->source = htons(pkt_dev->cur_udp_src);
@@ -3365,8 +3359,8 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                pkt_dev->errors++;
                break;
        default: /* Drivers are not supposed to return other values! */
-               if (net_ratelimit())
-                       pr_info("%s xmit error: %d\n", pkt_dev->odevname, ret);
+               net_info_ratelimited("%s xmit error: %d\n",
+                                    pkt_dev->odevname, ret);
                pkt_dev->errors++;
                /* fallthru */
        case NETDEV_TX_LOCKED: