diff options
| author | Paul Moore <paul@paul-moore.com> | 2017-01-06 20:26:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-07 04:20:45 +0100 |
| commit | bcd5e1a49f0d54afd3c5411bed2f59996e1c53e4 (patch) | |
| tree | ad10204d9e98d77cbaa1d301c553b786b8d9fa9a | |
| parent | Merge tag 'mac80211-for-davem-2017-01-06' of git://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-bcd5e1a49f0d54afd3c5411bed2f59996e1c53e4.tar.xz linux-bcd5e1a49f0d54afd3c5411bed2f59996e1c53e4.zip | |
netlabel: add CALIPSO to the list of built-in protocols
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 5 |
1 files changed, 1 insertions, 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) |