wimax: oops: wimax_dev_add() is the only one that can initialize the state

[safe/jmp/linux-2.6] / net / netlabel / netlabel_addrlist.c

diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c
index 614c95e..c051913 100644 (file)
--- a/net/netlabel/netlabel_addrlist.c
+++ b/net/netlabel/netlabel_addrlist.c
@@ -256,13 +256,11 @@ struct netlbl_af4list *netlbl_af4list_remove(__be32 addr, __be32 mask,
 {
        struct netlbl_af4list *entry;
 
-       entry = netlbl_af4list_search(addr, head);
-       if (entry != NULL && entry->addr == addr && entry->mask == mask) {
-               netlbl_af4list_remove_entry(entry);
-               return entry;
-       }
-
-       return NULL;
+       entry = netlbl_af4list_search_exact(addr, mask, head);
+       if (entry == NULL)
+               return NULL;
+       netlbl_af4list_remove_entry(entry);
+       return entry;
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -299,15 +297,11 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,
 {
        struct netlbl_af6list *entry;
 
-       entry = netlbl_af6list_search(addr, head);
-       if (entry != NULL &&
-           ipv6_addr_equal(&entry->addr, addr) &&
-           ipv6_addr_equal(&entry->mask, mask)) {
-               netlbl_af6list_remove_entry(entry);
-               return entry;
-       }
-
-       return NULL;
+       entry = netlbl_af6list_search_exact(addr, mask, head);
+       if (entry == NULL)
+               return NULL;
+       netlbl_af6list_remove_entry(entry);
+       return entry;
 }
 #endif /* IPv6 */
 
@@ -315,6 +309,7 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,
  * Audit Helper Functions
  */
 
+#ifdef CONFIG_AUDIT
 /**
  * netlbl_af4list_audit_addr - Audit an IPv4 address
  * @audit_buf: audit buffer
@@ -336,7 +331,7 @@ void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
 
        if (dev != NULL)
                audit_log_format(audit_buf, " netif=%s", dev);
-       audit_log_format(audit_buf, " %s=" NIPQUAD_FMT, dir, NIPQUAD(addr));
+       audit_log_format(audit_buf, " %s=%pI4", dir, &addr);
        if (mask_val != 0xffffffff) {
                u32 mask_len = 0;
                while (mask_val > 0) {
@@ -370,7 +365,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
 
        if (dev != NULL)
                audit_log_format(audit_buf, " netif=%s", dev);
-       audit_log_format(audit_buf, " %s=%p6", dir, addr);
+       audit_log_format(audit_buf, " %s=%pI6", dir, addr);
        if (ntohl(mask->s6_addr32[3]) != 0xffffffff) {
                u32 mask_len = 0;
                u32 mask_val;
@@ -386,3 +381,4 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
        }
 }
 #endif /* IPv6 */
+#endif /* CONFIG_AUDIT */