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

[pandora-kernel.git] / net / core / pktgen.c

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 77a5998..70236db 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;
@@ -1510,7 +1510,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)
@@ -2324,7 +2324,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 +2550,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 +2934,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 +3364,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: