From: David Kilroy <kilroyd@googlemail.com>
To: linux-kernel@vger.kernel.org, greg@kroah.com
Cc: pe1dnn@amsat.org, David Kilroy <kilroyd@googlemail.com>
Subject: [PATCH 06/13] staging: wlags49_h2: Simplify HCF_ENCAP usage
Date: Fri, 16 Sep 2011 00:20:50 +0100 [thread overview]
Message-ID: <1316128857-9781-7-git-send-email-kilroyd@googlemail.com> (raw)
In-Reply-To: <1316128857-9781-1-git-send-email-kilroyd@googlemail.com>
Encapsulation should always be enabled. Support is either via firmware
or in the driver, so we need to keep the macro. The driver can stop
exporting hcf_encap
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
---
drivers/staging/wlags49_h2/hcf.c | 11 +----------
drivers/staging/wlags49_h2/hcf.h | 3 ---
2 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c
index b38fea5..e1d391a 100644
--- a/drivers/staging/wlags49_h2/hcf.c
+++ b/drivers/staging/wlags49_h2/hcf.c
@@ -133,9 +133,7 @@ static int fw_printf(IFBP ifbp, CFG_FW_PRINTF_STRCT FAR *ltvp);
#endif // HCF_ASSERT_PRINTF
HCF_STATIC int download( IFBP ifbp, CFG_PROG_STRCT FAR *ltvp );
-#if (HCF_ENCAP) & HCF_ENC
HCF_STATIC hcf_8 hcf_encap( wci_bufp type );
-#endif // HCF_ENCAP
HCF_STATIC hcf_8 null_addr[4] = { 0, 0, 0, 0 };
#if ! defined IN_PORT_WORD //replace I/O Macros with logging facility
extern FILE *log_file;
@@ -244,11 +242,9 @@ void OUT_PORT_STRING_8_16( hcf_io prt, hcf_8 FAR * src, int n) { //also handl
IFBP BASED assert_ifbp = NULL; //to make asserts easily work under MMD and DHF
#endif // HCF_ASSERT
-#if HCF_ENCAP
/* SNAP header to be inserted in Ethernet-II frames */
HCF_STATIC hcf_8 BASED snap_header[] = { 0xAA, 0xAA, 0x03, 0x00, 0x00, //5 bytes signature +
0 }; //1 byte protocol identifier
-#endif // HCF_ENCAP
#if (HCF_TYPE) & HCF_TYPE_WPA
HCF_STATIC hcf_8 BASED mic_pad[8] = { 0x5A, 0, 0, 0, 0, 0, 0, 0 }; //MIC padding of message
@@ -1890,11 +1886,7 @@ hcf_dma_tx_put( IFBP ifbp, DESC_STRCT *descp, hcf_16 tx_cntl )
*.ENDDOC END DOCUMENTATION
*
************************************************************************************************************/
-#if HCF_ENCAP //i.e HCF_ENC or HCF_ENC_SUP
-#if ! ( (HCF_ENCAP) & HCF_ENC_SUP )
-HCF_STATIC
-#endif // HCF_ENCAP
-hcf_8
+HCF_STATIC hcf_8
hcf_encap( wci_bufp type )
{
@@ -1910,7 +1902,6 @@ hcf_encap( wci_bufp type )
}
return rc;
} // hcf_encap
-#endif // HCF_ENCAP
/************************************************************************************************************
diff --git a/drivers/staging/wlags49_h2/hcf.h b/drivers/staging/wlags49_h2/hcf.h
index 2cd5739..4fd62cd 100644
--- a/drivers/staging/wlags49_h2/hcf.h
+++ b/drivers/staging/wlags49_h2/hcf.h
@@ -382,9 +382,6 @@ typedef IFB_STRCT* IFBP;
EXTERN_C int hcf_action (IFBP ifbp, hcf_16 cmd );
EXTERN_C int hcf_connect (IFBP ifbp, hcf_io io_base );
-#if (HCF_ENCAP) & HCF_ENC_SUP
-EXTERN_C hcf_8 hcf_encap (wci_bufp type );
-#endif // HCF_ENC_SUP
EXTERN_C int hcf_get_info (IFBP ifbp, LTVP ltvp );
EXTERN_C int hcf_service_nic (IFBP ifbp, wci_bufp bufp, unsigned int len );
EXTERN_C int hcf_cntl (IFBP ifbp, hcf_16 cmd );
--
1.7.4.1
next prev parent reply other threads:[~2011-09-15 23:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 23:20 [PATCH 00/13] wlags49_h2: Various cleanups David Kilroy
2011-09-15 23:20 ` [PATCH 01/13] staging: wlags49_h2: Remove non-linux configurations David Kilroy
2011-09-15 23:20 ` [PATCH 02/13] staging: wlags49_h2: Reindent hcfdef.h David Kilroy
2011-09-15 23:20 ` [PATCH 03/13] staging: wlags49_h2: Fix macro termination David Kilroy
2011-09-15 23:20 ` [PATCH 04/13] staging: wlags49_h2: Reindent hcf.c David Kilroy
2011-09-15 23:20 ` [PATCH 05/13] staging: wlags49_h2: Remove HCF_DL_ONLY David Kilroy
2011-09-15 23:20 ` David Kilroy [this message]
2011-09-15 23:20 ` [PATCH 07/13] staging: wlags49_h2: Remove some unused defines David Kilroy
2011-09-15 23:20 ` [PATCH 08/13] staging: wlags49_h2: Remove references to SSN David Kilroy
2011-09-15 23:20 ` [PATCH 09/13] staging: wlags49_h2: Remove MUL/DIV_BY_2 David Kilroy
2011-09-15 23:20 ` [PATCH 10/13] staging: wlags49_h2: Remove CKIP support from hcf David Kilroy
2011-09-15 23:20 ` [PATCH 11/13] staging: wlags49_h2: Remove HCF_EXT_MB from code David Kilroy
2011-09-15 23:20 ` [PATCH 12/13] staging: wlags49_h2: Reformat TX_CNTL comment David Kilroy
2011-09-15 23:20 ` [PATCH 13/13] staging: wlags49_h2: Remove continuous tx test David Kilroy
2011-09-16 21:10 ` [PATCH 00/13] wlags49_h2: Various cleanups Henk de Groot
2011-09-19 17:59 ` Dave Kilroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316128857-9781-7-git-send-email-kilroyd@googlemail.com \
--to=kilroyd@googlemail.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pe1dnn@amsat.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®