From bd2ff0a0fcc8beb5606bf33fa33380a2c6d98c24 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 19 Nov 2007 23:46:29 -0800 Subject: [PATCH] --- yaml --- r: 74197 b: refs/heads/master c: 464c4f184ac671c6206d502a67034f9bfe9fe25c h: refs/heads/master i: 74195: 73bcbb1fdf4bc6b0d324dbc15cff9388bd716e4a v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipvs/ip_vs_core.c | 2 +- trunk/net/ipv4/netfilter/iptable_raw.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 398f00511a4e..075d548b5bf0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4756daa3b63e806d8ef093c8b4b5f56ee34250a2 +refs/heads/master: 464c4f184ac671c6206d502a67034f9bfe9fe25c diff --git a/trunk/net/ipv4/ipvs/ip_vs_core.c b/trunk/net/ipv4/ipvs/ip_vs_core.c index 20c884a57721..8fba20256f52 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_core.c +++ b/trunk/net/ipv4/ipvs/ip_vs_core.c @@ -637,7 +637,7 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related) verdict = NF_DROP; if (IP_VS_FWD_METHOD(cp) != 0) { - IP_VS_ERR("shouldn't reach here, because the box is on the" + IP_VS_ERR("shouldn't reach here, because the box is on the " "half connection in the tun/dr module.\n"); } diff --git a/trunk/net/ipv4/netfilter/iptable_raw.c b/trunk/net/ipv4/netfilter/iptable_raw.c index 5de6e57ac55c..f8678651250f 100644 --- a/trunk/net/ipv4/netfilter/iptable_raw.c +++ b/trunk/net/ipv4/netfilter/iptable_raw.c @@ -66,7 +66,7 @@ ipt_local_hook(unsigned int hook, if (skb->len < sizeof(struct iphdr) || ip_hdrlen(skb) < sizeof(struct iphdr)) { if (net_ratelimit()) - printk("iptable_raw: ignoring short SOCK_RAW" + printk("iptable_raw: ignoring short SOCK_RAW " "packet.\n"); return NF_ACCEPT; }