From d72913666ab633234b8f6b14520504cd3615c1cf Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 6 Aug 2010 03:13:52 +0100 Subject: [PATCH] --- yaml --- r: 206265 b: refs/heads/master c: ff9517a68792bb363c16f4e3155c4fc5a7f9d738 h: refs/heads/master i: 206263: 5d36d4174db8aa0f29f374e4d36350c56334732a v: v3 --- [refs] | 2 +- trunk/Documentation/networking/dns_resolver.txt | 6 +++--- trunk/net/dns_resolver/dns_query.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2052ade272fa..178d72316824 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af352fe960263fbab3252be0ba6d4e0a27e62f5d +refs/heads/master: ff9517a68792bb363c16f4e3155c4fc5a7f9d738 diff --git a/trunk/Documentation/networking/dns_resolver.txt b/trunk/Documentation/networking/dns_resolver.txt index d8e0ce1d38c7..aefd1e681804 100644 --- a/trunk/Documentation/networking/dns_resolver.txt +++ b/trunk/Documentation/networking/dns_resolver.txt @@ -96,9 +96,9 @@ implemented in the module can be called after doing: for the default query type it is just a list of comma-separated IPv4 and IPv6 addresses. The caller must free the result. - The length of the result string is returned on success, and a -ve error - code is returned otherwise. -EKEYREJECTED will be returned if the DNS - lookup failed. + The length of the result string is returned on success, and a negative + error code is returned otherwise. -EKEYREJECTED will be returned if the + DNS lookup failed. If _expiry is non-NULL, the expiry time (TTL) of the result will be returned also. diff --git a/trunk/net/dns_resolver/dns_query.c b/trunk/net/dns_resolver/dns_query.c index b33e1f7ff48d..03d5255f5cf2 100644 --- a/trunk/net/dns_resolver/dns_query.c +++ b/trunk/net/dns_resolver/dns_query.c @@ -45,7 +45,7 @@ #include "internal.h" -/* +/** * dns_query - Query the DNS * @type: Query type (or NULL for straight host->IP lookup) * @name: Name to look up