From a088de88b771bde90dcb83592023037245e559a7 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Tue, 29 Aug 2006 17:54:17 -0700 Subject: [PATCH] --- yaml --- r: 34653 b: refs/heads/master c: 1b7f775209bbee6b993587bae69acb9fc12ceb17 h: refs/heads/master i: 34651: fc867110ae31343b1719ec519ef91b00580beb21 v: v3 --- [refs] | 2 +- trunk/include/net/cipso_ipv4.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0cfedf5965f3..3c3f12ff6476 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99f59ed073d3c1b890690064ab285a201dea2e35 +refs/heads/master: 1b7f775209bbee6b993587bae69acb9fc12ceb17 diff --git a/trunk/include/net/cipso_ipv4.h b/trunk/include/net/cipso_ipv4.h index c7175e725804..5aed72ab652b 100644 --- a/trunk/include/net/cipso_ipv4.h +++ b/trunk/include/net/cipso_ipv4.h @@ -200,15 +200,9 @@ static inline int cipso_v4_cache_add(const struct sk_buff *skb, #ifdef CONFIG_NETLABEL void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway); -int cipso_v4_socket_setopt(struct socket *sock, - unsigned char *opt, - u32 opt_len); int cipso_v4_socket_setattr(const struct socket *sock, const struct cipso_v4_doi *doi_def, const struct netlbl_lsm_secattr *secattr); -int cipso_v4_socket_getopt(const struct socket *sock, - unsigned char **opt, - u32 *opt_len); int cipso_v4_socket_getattr(const struct socket *sock, struct netlbl_lsm_secattr *secattr); int cipso_v4_skbuff_getattr(const struct sk_buff *skb,