diff options
author | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /net | |
parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) |
Merge branch 'next-queue' into next
Diffstat (limited to 'net')
-rw-r--r-- | net/dns_resolver/dns_key.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index cfa7a5e1c5c9..fa000d26dc60 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c | |||
@@ -212,10 +212,12 @@ static void dns_resolver_describe(const struct key *key, struct seq_file *m) | |||
212 | int err = key->type_data.x[0]; | 212 | int err = key->type_data.x[0]; |
213 | 213 | ||
214 | seq_puts(m, key->description); | 214 | seq_puts(m, key->description); |
215 | if (err) | 215 | if (key_is_instantiated(key)) { |
216 | seq_printf(m, ": %d", err); | 216 | if (err) |
217 | else | 217 | seq_printf(m, ": %d", err); |
218 | seq_printf(m, ": %u", key->datalen); | 218 | else |
219 | seq_printf(m, ": %u", key->datalen); | ||
220 | } | ||
219 | } | 221 | } |
220 | 222 | ||
221 | /* | 223 | /* |