Message ID | 148373081425.18818.6670627192248645738.stgit@sifl |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
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.
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)