* [PATCH] netlabel: add CALIPSO to the list of built-in protocols
@ 2017-01-06 19:26 Paul Moore
2017-01-07 3:21 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Paul Moore @ 2017-01-06 19:26 UTC (permalink / raw)
To: netdev
From: Paul Moore <paul@paul-moore.com>
When we added CALIPSO support in Linux v4.8 we forgot to add it to the
list of supported protocols with display at boot.
Signed-off-by: Paul Moore <paul@paul-moore.com>
---
net/netlabel/netlabel_kapi.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 28c56b95fb7f..ea7c67050792 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -1502,10 +1502,7 @@ static int __init netlbl_init(void)
printk(KERN_INFO "NetLabel: Initializing\n");
printk(KERN_INFO "NetLabel: domain hash size = %u\n",
(1 << NETLBL_DOMHSH_BITSIZE));
- printk(KERN_INFO "NetLabel: protocols ="
- " UNLABELED"
- " CIPSOv4"
- "\n");
+ printk(KERN_INFO "NetLabel: protocols = UNLABELED CIPSOv4 CALIPSO\n");
ret_val = netlbl_domhsh_init(NETLBL_DOMHSH_BITSIZE);
if (ret_val != 0)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] netlabel: add CALIPSO to the list of built-in protocols
2017-01-06 19:26 [PATCH] netlabel: add CALIPSO to the list of built-in protocols Paul Moore
@ 2017-01-07 3:21 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-01-07 3:21 UTC (permalink / raw)
To: pmoore; +Cc: netdev
From: Paul Moore <pmoore@redhat.com>
Date: Fri, 06 Jan 2017 14:26:54 -0500
> From: Paul Moore <paul@paul-moore.com>
>
> When we added CALIPSO support in Linux v4.8 we forgot to add it to the
> list of supported protocols with display at boot.
>
> Signed-off-by: Paul Moore <paul@paul-moore.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-07 3:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-06 19:26 [PATCH] netlabel: add CALIPSO to the list of built-in protocols Paul Moore
2017-01-07 3:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).