Re: [PATCH] acxsm: Reduce the number of ACX_PACKED instructions
On Wednesday 12 April 2006 23:58, John W. Linville wrote: On Sat, Mar 25, 2006 at 09:01:16PM +0100, Carlos Martin wrote: Up to now, we were using ACX_PACKED after every field. I've finally found out how to use only one at the end of each struct whilst maintaining the typedef where it is now. This should also apply to acx with a bit of fuzz, but I consider it to be in maintenance mode, so this doesn't qualify for it. Signed-off-by: Carlos Martin [EMAIL PROTECTED] --- acx_struct.h | 874 +- common.c | 26 +- ioctl.c | 10 - usb.c|8 - 4 files changed, 457 insertions(+), 461 deletions(-) 5fb2fdfd8c028a40921bbf9ef7ec4c53c03fcab4 diff --git a/acx_struct.h b/acx_struct.h Denis, have you got this patch? Or do I need to apply it? I tried to sync with your git tree, but: Sometime ago I downloaded softmac git tree with # cg-branch-add r-softmac 'rsync://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#softmac' but today I can't update from that: # cg-update r-softmac Recovering from a previously interrupted fetch... WARNING: The rsync access method is DEPRECATED and will be REMOVED in the future! Fetching head... MOTD: MOTD: Welcome to the Linux Kernel Archive. MOTD: MOTD: Due to U.S. Exports Regulations, all cryptographic software on this MOTD: site is subject to the following legal notice: MOTD: MOTD: This site includes publicly available encryption source code MOTD: which, together with object code resulting from the compiling of MOTD: publicly available source code, may be exported from the United MOTD: States under License Exception TSU pursuant to 15 C.F.R. Section MOTD: 740.13(e). MOTD: MOTD: This legal notice applies to cryptographic software only. MOTD: Please see the Bureau of Industry and Security, MOTD: http://www.bis.doc.gov/ for more information about current MOTD: U.S. regulations. MOTD: receiving file list ... done sent 4 bytes received 9 bytes 0.36 bytes/sec total size is 0 speedup is 0.00 cg-fetch: unable to get the head pointer of branch softmac Did you rename softmac branch again? -- vda - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] acxsm: Reduce the number of ACX_PACKED instructions
On Thu, Apr 13, 2006 at 03:33:57PM +0300, Denis Vlasenko wrote: Did you rename softmac branch again? I'm trying to reduce the branches. Some/most of what was the softmac branch has been merged upstream. The tiacx and prism54usb drivers remain in wireless-2.6 under the master branch. BTW, the consensus at the wifi summit was that the remaining softmac drivers should be merged upstream as sson as the basic coding issues (compiles w/o warnings, follows kernel style, etc) are resolved. Actually working is not a solid requirement. With that in mind, I would appreciate it if you (and any other interested party) would begin reviewing the code with the intent to get it merged in the next cycle. Thanks, John -- John W. Linville [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] acxsm: Reduce the number of ACX_PACKED instructions
On Sat, Mar 25, 2006 at 09:01:16PM +0100, Carlos Martin wrote: Up to now, we were using ACX_PACKED after every field. I've finally found out how to use only one at the end of each struct whilst maintaining the typedef where it is now. This should also apply to acx with a bit of fuzz, but I consider it to be in maintenance mode, so this doesn't qualify for it. Signed-off-by: Carlos Martin [EMAIL PROTECTED] --- acx_struct.h | 874 +- common.c | 26 +- ioctl.c | 10 - usb.c|8 - 4 files changed, 457 insertions(+), 461 deletions(-) 5fb2fdfd8c028a40921bbf9ef7ec4c53c03fcab4 diff --git a/acx_struct.h b/acx_struct.h Denis, have you got this patch? Or do I need to apply it? Carlos, please make your diffs from the root of the kernel tree. Thanks, John -- John W. Linville [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] acxsm: Reduce the number of ACX_PACKED instructions
Up to now, we were using ACX_PACKED after every field. I've finally
found out how to use only one at the end of each struct whilst
maintaining the typedef where it is now.
This should also apply to acx with a bit of fuzz, but I consider it to
be in maintenance mode, so this doesn't qualify for it.
Signed-off-by: Carlos Martin [EMAIL PROTECTED]
---
acx_struct.h | 874 +-
common.c | 26 +-
ioctl.c | 10 -
usb.c|8 -
4 files changed, 457 insertions(+), 461 deletions(-)
5fb2fdfd8c028a40921bbf9ef7ec4c53c03fcab4
diff --git a/acx_struct.h b/acx_struct.h
index 227b6e3..8c92302 100644
--- a/acx_struct.h
+++ b/acx_struct.h
@@ -522,9 +522,9 @@ DEF_IE(111_IE_DOT11_INVAL_1013, 0x1013
* --vda
*/
typedef struct phy_hdr {
- u8 unknown[4] ACX_PACKED;
- u8 acx111_unknown[4] ACX_PACKED;
-} phy_hdr_t;
+ u8 unknown[4];
+ u8 acx111_unknown[4];
+} ACX_PACKED phy_hdr_t;
/* seems to be a bit similar to hfa384x_rx_frame.
* These fields are still not quite obvious, though.
@@ -584,22 +584,22 @@ time: 4 bytes:
*/
typedef struct rxbuffer {
- u16 mac_cnt_rcvd ACX_PACKED;/* only 12 bits are len!
(0xfff) */
- u8 mac_cnt_mblks ACX_PACKED;
- u8 mac_status ACX_PACKED;
- u8 phy_stat_baseband ACX_PACKED; /* bit 0x80: used LNA
(Low-Noise Amplifier) */
- u8 phy_plcp_signal ACX_PACKED;
- u8 phy_level ACX_PACKED; /* PHY stat */
- u8 phy_snr ACX_PACKED; /* PHY stat */
- u32 time ACX_PACKED;/* timestamp upon MAC rcv first
byte */
+ u16 mac_cnt_rcvd; /* only 12 bits are len! (0xfff) */
+ u8 mac_cnt_mblks;
+ u8 mac_status;
+ u8 phy_stat_baseband; /* bit 0x80: used LNA (Low-Noise
Amplifier) */
+ u8 phy_plcp_signal;
+ u8 phy_level; /* PHY stat */
+ u8 phy_snr;/* PHY stat */
+ u32 time; /* timestamp upon MAC rcv first byte */
/* 4-byte (acx100) or 8-byte (acx111) phy header will be here
** if RX_CFG1_INCLUDE_PHY_HDR is in effect:
** phy_hdr_t phy */
- wlan_hdr_a3_t hdr_a3 ACX_PACKED;
+ wlan_hdr_a3_t hdr_a3;
/* maximally sized data part of wlan packet */
- u8 data_a3[WLAN_A4FR_MAXLEN_WEP_FCS - WLAN_HDR_A3_LEN] ACX_PACKED;
+ u8 data_a3[WLAN_A4FR_MAXLEN_WEP_FCS - WLAN_HDR_A3_LEN];
/* can add hdr/data_a4 if needed */
-} rxbuffer_t;
+} ACX_PACKED rxbuffer_t;
/*--- Firmware statistics
*/
@@ -609,93 +609,93 @@ typedef struct rxbuffer {
#define FW_STATS_FUTURE_EXTENSION 100
typedef struct fw_stats_tx {
- u32 tx_desc_of ACX_PACKED;
-} fw_stats_tx_t;
+ u32 tx_desc_of;
+} ACX_PACKED fw_stats_tx_t;
typedef struct fw_stats_rx {
- u32 rx_oom ACX_PACKED;
- u32 rx_hdr_of ACX_PACKED;
- u32 rx_hw_stuck ACX_PACKED; /* old: u32 rx_hdr_use_next */
- u32 rx_dropped_frame ACX_PACKED;
- u32 rx_frame_ptr_err ACX_PACKED;
- u32 rx_xfr_hint_trig ACX_PACKED;
- u32 rx_aci_events ACX_PACKED; /* later versions only */
- u32 rx_aci_resets ACX_PACKED; /* later versions only */
-} fw_stats_rx_t;
+ u32 rx_oom;
+ u32 rx_hdr_of;
+ u32 rx_hw_stuck; /* old: u32rx_hdr_use_next */
+ u32 rx_dropped_frame;
+ u32 rx_frame_ptr_err;
+ u32 rx_xfr_hint_trig;
+ u32 rx_aci_events; /* later versions only */
+ u32 rx_aci_resets; /* later versions only */
+} ACX_PACKED fw_stats_rx_t;
typedef struct fw_stats_dma {
- u32 rx_dma_req ACX_PACKED;
- u32 rx_dma_err ACX_PACKED;
- u32 tx_dma_req ACX_PACKED;
- u32 tx_dma_err ACX_PACKED;
-} fw_stats_dma_t;
+ u32 rx_dma_req;
+ u32 rx_dma_err;
+ u32 tx_dma_req;
+ u32 tx_dma_err;
+} ACX_PACKED fw_stats_dma_t;
typedef struct fw_stats_irq {
- u32 cmd_cplt ACX_PACKED;
- u32 fiq ACX_PACKED;
- u32 rx_hdrs ACX_PACKED;
- u32 rx_cmplt ACX_PACKED;
- u32 rx_mem_of ACX_PACKED;
- u32 rx_rdys ACX_PACKED;
- u32 irqs ACX_PACKED;
- u32 tx_procs ACX_PACKED;
- u32 decrypt_done ACX_PACKED;
- u32 dma_0_done ACX_PACKED;
- u32 dma_1_done ACX_PACKED;
- u32 tx_exch_complet ACX_PACKED;
- u32 commands ACX_PACKED;
- u32 rx_procs ACX_PACKED;
- u32 hw_pm_mode_changes ACX_PACKED;
- u32 host_acks ACX_PACKED;
- u32 pci_pm ACX_PACKED;
- u32 acm_wakeups ACX_PACKED;
-} fw_stats_irq_t;
+ u32 cmd_cplt;
+ u32 fiq;
+ u32 rx_hdrs;
+ u32 rx_cmplt;
+
