aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 7bc2db6db8d4..960fbfc3e976 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -26,7 +26,6 @@
26 * 26 *
27 */ 27 */
28 28
29#include <asm/system.h>
30#include <asm/uaccess.h> 29#include <asm/uaccess.h>
31#include <linux/types.h> 30#include <linux/types.h>
32#include <linux/capability.h> 31#include <linux/capability.h>
@@ -951,7 +950,7 @@ static int ipmr_cache_report(struct mr_table *mrt,
951 rcu_read_unlock(); 950 rcu_read_unlock();
952 if (ret < 0) { 951 if (ret < 0) {
953 if (net_ratelimit()) 952 if (net_ratelimit())
954 printk(KERN_WARNING "mroute: pending queue full, dropping entries.\n"); 953 pr_warn("mroute: pending queue full, dropping entries\n");
955 kfree_skb(skb); 954 kfree_skb(skb);
956 } 955 }
957 956
@@ -2538,7 +2537,7 @@ int __init ip_mr_init(void)
2538 goto reg_notif_fail; 2537 goto reg_notif_fail;
2539#ifdef CONFIG_IP_PIMSM_V2 2538#ifdef CONFIG_IP_PIMSM_V2
2540 if (inet_add_protocol(&pim_protocol, IPPROTO_PIM) < 0) { 2539 if (inet_add_protocol(&pim_protocol, IPPROTO_PIM) < 0) {
2541 printk(KERN_ERR "ip_mr_init: can't add PIM protocol\n"); 2540 pr_err("%s: can't add PIM protocol\n", __func__);
2542 err = -EAGAIN; 2541 err = -EAGAIN;
2543 goto add_proto_fail; 2542 goto add_proto_fail;
2544 } 2543 }