diff options
author | Joe Perches <joe@perches.com> | 2014-09-10 00:17:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-10 15:40:10 -0400 |
commit | 294a0b7f3148e2a4e916965a6d14838e08143ba8 (patch) | |
tree | 3af86c0e5c00ec7be12941f7b27c0652176a8176 /net/core | |
parent | ef423a410943dab9198ec1d7d9558cb53a9569cc (diff) |
pktgen: Convert pr_warning to pr_warn
Use the more common pr_warn.
Realign arguments.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/pktgen.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 21cb4839bc97..5c728aaf8d6c 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -506,7 +506,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf, | |||
506 | pktgen_reset_all_threads(pn); | 506 | pktgen_reset_all_threads(pn); |
507 | 507 | ||
508 | else | 508 | else |
509 | pr_warning("Unknown command: %s\n", data); | 509 | pr_warn("Unknown command: %s\n", data); |
510 | 510 | ||
511 | return count; | 511 | return count; |
512 | } | 512 | } |
@@ -861,14 +861,14 @@ static ssize_t pktgen_if_write(struct file *file, | |||
861 | pg_result = &(pkt_dev->result[0]); | 861 | pg_result = &(pkt_dev->result[0]); |
862 | 862 | ||
863 | if (count < 1) { | 863 | if (count < 1) { |
864 | pr_warning("wrong command format\n"); | 864 | pr_warn("wrong command format\n"); |
865 | return -EINVAL; | 865 | return -EINVAL; |
866 | } | 866 | } |
867 | 867 | ||
868 | max = count; | 868 | max = count; |
869 | tmp = count_trail_chars(user_buffer, max); | 869 | tmp = count_trail_chars(user_buffer, max); |
870 | if (tmp < 0) { | 870 | if (tmp < 0) { |
871 | pr_warning("illegal format\n"); | 871 | pr_warn("illegal format\n"); |
872 | return tmp; | 872 | return tmp; |
873 | } | 873 | } |
874 | i = tmp; | 874 | i = tmp; |
@@ -2056,15 +2056,15 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) | |||
2056 | ntxq = pkt_dev->odev->real_num_tx_queues; | 2056 | ntxq = pkt_dev->odev->real_num_tx_queues; |
2057 | 2057 | ||
2058 | if (ntxq <= pkt_dev->queue_map_min) { | 2058 | if (ntxq <= pkt_dev->queue_map_min) { |
2059 | pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", | 2059 | pr_warn("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", |
2060 | pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq, | 2060 | pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq, |
2061 | pkt_dev->odevname); | 2061 | pkt_dev->odevname); |
2062 | pkt_dev->queue_map_min = (ntxq ?: 1) - 1; | 2062 | pkt_dev->queue_map_min = (ntxq ?: 1) - 1; |
2063 | } | 2063 | } |
2064 | if (pkt_dev->queue_map_max >= ntxq) { | 2064 | if (pkt_dev->queue_map_max >= ntxq) { |
2065 | pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", | 2065 | pr_warn("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", |
2066 | pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq, | 2066 | pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq, |
2067 | pkt_dev->odevname); | 2067 | pkt_dev->odevname); |
2068 | pkt_dev->queue_map_max = (ntxq ?: 1) - 1; | 2068 | pkt_dev->queue_map_max = (ntxq ?: 1) - 1; |
2069 | } | 2069 | } |
2070 | 2070 | ||
@@ -3173,8 +3173,8 @@ static int pktgen_stop_device(struct pktgen_dev *pkt_dev) | |||
3173 | int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1; | 3173 | int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1; |
3174 | 3174 | ||
3175 | if (!pkt_dev->running) { | 3175 | if (!pkt_dev->running) { |
3176 | pr_warning("interface: %s is already stopped\n", | 3176 | pr_warn("interface: %s is already stopped\n", |
3177 | pkt_dev->odevname); | 3177 | pkt_dev->odevname); |
3178 | return -EINVAL; | 3178 | return -EINVAL; |
3179 | } | 3179 | } |
3180 | 3180 | ||
@@ -3692,7 +3692,7 @@ static int pktgen_remove_device(struct pktgen_thread *t, | |||
3692 | pr_debug("remove_device pkt_dev=%p\n", pkt_dev); | 3692 | pr_debug("remove_device pkt_dev=%p\n", pkt_dev); |
3693 | 3693 | ||
3694 | if (pkt_dev->running) { | 3694 | if (pkt_dev->running) { |
3695 | pr_warning("WARNING: trying to remove a running interface, stopping it now\n"); | 3695 | pr_warn("WARNING: trying to remove a running interface, stopping it now\n"); |
3696 | pktgen_stop_device(pkt_dev); | 3696 | pktgen_stop_device(pkt_dev); |
3697 | } | 3697 | } |
3698 | 3698 | ||