Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd46503 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: ipv4: Standardize prefixes for message logging 



Add #define pr_fmt(fmt) as appropriate.

Add "IPv4: ", "TCP: ", and "IPsec: " to appropriate files.
Standardize on "UDPLite: " for appropriate uses.
Some prefixes were previously "UDPLITE: " and "UDP-Lite: ".

Add KBUILD_MODNAME ": " to icmp and gre.
Remove embedded prefixes as appropriate.

Add missing "\n" to pr_info in gre.c.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 058bd4d2

include/net/udplite.h

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh) 
         * checksum. UDP-Lite (like IPv6) mandates checksums, hence packets

         * with a zero checksum field are illegal.                            */

	if (uh->check == 0) {

		LIMIT_NETDEBUG(KERN_DEBUG "UDPLITE: zeroed checksum field\n");

		LIMIT_NETDEBUG(KERN_DEBUG "UDPLite: zeroed checksum field\n");

		return 1;

	}
@@ -52,7 +52,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh) 
		/*

		 * Coverage length violates RFC 3828: log and discard silently.

		 */

		LIMIT_NETDEBUG(KERN_DEBUG "UDPLITE: bad csum coverage %d/%d\n",

		LIMIT_NETDEBUG(KERN_DEBUG "UDPLite: bad csum coverage %d/%d\n",

			       cscov, skb->len);

		return 1;

net/ipv4/af_inet.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
 *		2 of the License, or (at your option) any later version.

 */



#define pr_fmt(fmt) "IPv4: " fmt



#include <linux/err.h>

#include <linux/errno.h>

#include <linux/types.h>

net/ipv4/ah4.c

+6 −3
Original line number Diff line number Diff line 
#define pr_fmt(fmt) "IPsec: " fmt



#include <crypto/hash.h>

#include <linux/err.h>

#include <linux/module.h>
@@ -445,8 +447,9 @@ static int ah_init_state(struct xfrm_state *x) 


	if (aalg_desc->uinfo.auth.icv_fullbits/8 !=

	    crypto_ahash_digestsize(ahash)) {

		pr_info("AH: %s digestsize %u != %hu\n",

			x->aalg->alg_name, crypto_ahash_digestsize(ahash),

		pr_info("%s: %s digestsize %u != %hu\n",

			__func__, x->aalg->alg_name,

			crypto_ahash_digestsize(ahash),

			aalg_desc->uinfo.auth.icv_fullbits / 8);

		goto error;

	}

net/ipv4/esp4.c

+2 −0
Original line number Diff line number Diff line 
#define pr_fmt(fmt) "IPsec: " fmt



#include <crypto/aead.h>

#include <crypto/authenc.h>

#include <linux/err.h>

net/ipv4/gre.c

+4 −2
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kmod.h>
@@ -118,10 +120,10 @@ static const struct net_protocol net_gre_protocol = { 


static int __init gre_init(void)

{

	pr_info("GRE over IPv4 demultiplexor driver");

	pr_info("GRE over IPv4 demultiplexor driver\n");



	if (inet_add_protocol(&net_gre_protocol, IPPROTO_GRE) < 0) {

		pr_err("gre: can't add protocol\n");

		pr_err("can't add protocol\n");

		return -EAGAIN;

	}