Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 13 insertions, 13 deletions

diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 8c0308032178..f3c5c68c6848 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -450,13 +450,13 @@ add_iface_failure:
  * success, negative values on failure.
  *
  */
-static int netlbl_unlhsh_add(struct net *net,
-                             const char *dev_name,
-                             const void *addr,
-                             const void *mask,
-                             u32 addr_len,
-                             u32 secid,
-                             struct netlbl_audit *audit_info)
+int netlbl_unlhsh_add(struct net *net,
+                      const char *dev_name,
+                      const void *addr,
+                      const void *mask,
+                      u32 addr_len,
+                      u32 secid,
+                      struct netlbl_audit *audit_info)
 {
         int ret_val;
         int ifindex;
@@ -720,12 +720,12 @@ unlhsh_condremove_failure:
  * Returns zero on success, negative values on failure.
  *
  */
-static int netlbl_unlhsh_remove(struct net *net,
-                                const char *dev_name,
-                                const void *addr,
-                                const void *mask,
-                                u32 addr_len,
-                                struct netlbl_audit *audit_info)
+int netlbl_unlhsh_remove(struct net *net,
+                         const char *dev_name,
+                         const void *addr,
+                         const void *mask,
+                         u32 addr_len,
+                         struct netlbl_audit *audit_info)
 {
         int ret_val;
         struct net_device *dev;