diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /net/netlabel/netlabel_unlabeled.c | |
| parent | bzip2/lzma: centralize format detection (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2 (diff) | |
| download | linux-b17304245f0db0ac69b795c411407808f3f2796d.tar.xz linux-b17304245f0db0ac69b795c411407808f3f2796d.zip | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
| -rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 26 |
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; |