diff options
| author | Joe Perches <joe@perches.com> | 2010-08-30 00:24:54 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2010-08-30 13:23:08 -0700 |
| commit | dfffaef1eb2c0156432a3cf203fd8348651da912 (patch) | |
| tree | 9e11d7c22089344b55b950a00e1738605ec0937a /datapath/vport.c | |
| parent | 717d33b99ee3a35f8160c6551931154d3a062910 (diff) | |
| download | openvswitch-dfffaef1eb2c0156432a3cf203fd8348651da912.tar.gz | |
treewide: Use pr_fmt and pr_<level>
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Simon Horman <horms@verge.net.au>
[Jesse: Added missing pr_fmt in vport-gre.c and dp_sysfs_dp.c]
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath/vport.c')
| -rw-r--r-- | datapath/vport.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/datapath/vport.c b/datapath/vport.c index 4dd6cfe9e..91b650e54 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -6,6 +6,8 @@ * kernel, by Linus Torvalds and others. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/dcache.h> #include <linux/etherdevice.h> #include <linux/if.h> @@ -76,13 +78,14 @@ void vport_unlock(void) mutex_unlock(&vport_mutex); } -#define ASSERT_VPORT() do { \ - if (unlikely(!mutex_is_locked(&vport_mutex))) { \ - printk(KERN_ERR "openvswitch: vport lock not held at %s (%d)\n", \ - __FILE__, __LINE__); \ - dump_stack(); \ - } \ -} while(0) +#define ASSERT_VPORT() \ +do { \ + if (unlikely(!mutex_is_locked(&vport_mutex))) { \ + pr_err("vport lock not held at %s (%d)\n", \ + __FILE__, __LINE__); \ + dump_stack(); \ + } \ +} while (0) /** * vport_init - initialize vport subsystem @@ -616,7 +619,7 @@ struct vport *vport_locate(const char *name) struct hlist_node *node; if (unlikely(!mutex_is_locked(&vport_mutex) && !rtnl_is_locked())) { - printk(KERN_ERR "openvswitch: neither RTNL nor vport lock held in vport_locate\n"); + pr_err("neither RTNL nor vport lock held in vport_locate\n"); dump_stack(); } @@ -1247,8 +1250,9 @@ int vport_send(struct vport *vport, struct sk_buff *skb) mtu = vport_get_mtu(vport); if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) { if (net_ratelimit()) - printk(KERN_WARNING "%s: dropped over-mtu packet: %d > %d\n", - dp_name(vport_get_dp_port(vport)->dp), packet_length(skb), mtu); + pr_warn("%s: dropped over-mtu packet: %d > %d\n", + dp_name(vport_get_dp_port(vport)->dp), + packet_length(skb), mtu); goto error; } |