From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Fri, 24 May 2013 12:01:03 +0000 (-0400)
Subject: nwfilter: Remove error report in virNWFilterDHCPSnoopEnd
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b9c4bd0c07119d10913471e13d11d2aec43dc546;p=people%2Fdariof%2Flibvirt.git

nwfilter: Remove error report in virNWFilterDHCPSnoopEnd

Remove error reporting when calling the virNWFilterDHCPSnoopEnd
function with an interface for which no thread is snooping traffic.

Document the usage of this function.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index 451c78367..242f87f5f 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -2118,6 +2118,16 @@ err_exit:
     return -1;
 }
 
+/**
+ * End a DHCP snoop thread on the given interface or end all
+ * DHCP snoop threads.
+ *
+ * @ifname: Name of an interface or NULL to stop all snoop threads
+ *
+ * It is not an error to call this function with an interface name
+ * for which no thread is snooping traffic. In this case the call will
+ * be a no-op.
+ */
 void
 virNWFilterDHCPSnoopEnd(const char *ifname)
 {
@@ -2131,11 +2141,8 @@ virNWFilterDHCPSnoopEnd(const char *ifname)
     if (ifname) {
         ifkey = (char *)virHashLookup(virNWFilterSnoopState.ifnameToKey,
                                       ifname);
-        if (!ifkey) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("ifname \"%s\" not in key map"), ifname);
+        if (!ifkey)
             goto cleanup;
-        }
 
         ignore_value(virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey,
                                         ifname));