diff options
| author | James Morris <jmorris@namei.org> | 2009-01-05 08:56:01 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-05 08:56:01 +1100 |
| commit | 5c8c40be4b5a2944483bfc1a45d6c3fa02551af3 (patch) | |
| tree | d9a79fae500aa5172df7446a2c7a7bdd4e4d469c /net/netlabel/netlabel_unlabeled.c | |
| parent | 90bd49ab6649269cd10d0edc86d0e0f62864726a (diff) | |
| parent | 6d3dc07cbb1e88deed2e8710e215f232a56b1dce (diff) | |
| download | linux-5c8c40be4b5a2944483bfc1a45d6c3fa02551af3.tar.bz2 | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
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; |