Skip to content

Commit

Permalink
Staging: wlan-ng: Remove use of __WLAN_ATTRIB_PACK__
Browse files Browse the repository at this point in the history 
Replace all ocurrances of the __WLAN_ATTRIB_PACK__ from wlan_compat.h
by __attribute__((packed)) and remove it afterwards.

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Moritz Muehlenhoff authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 4bb5a7e commit 9cba46d
Show file tree
Hide file tree
Showing 9 changed files with 205 additions and 210 deletions.
310 changes: 155 additions & 155 deletions drivers/staging/wlan-ng/hfa384x.h
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions drivers/staging/wlan-ng/p80211conv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,22 @@ typedef struct wlan_ethhdr
u8 daddr[WLAN_ETHADDR_LEN];
u8 saddr[WLAN_ETHADDR_LEN];
u16 type;
} __WLAN_ATTRIB_PACK__ wlan_ethhdr_t;
} __attribute__((packed)) wlan_ethhdr_t;

/* local llc header type */
typedef struct wlan_llc
{
u8 dsap;
u8 ssap;
u8 ctl;
} __WLAN_ATTRIB_PACK__ wlan_llc_t;
} __attribute__((packed)) wlan_llc_t;

/* local snap header type */
typedef struct wlan_snap
{
u8 oui[WLAN_IEEE_OUI_LEN];
u16 type;
} __WLAN_ATTRIB_PACK__ wlan_snap_t;
} __attribute__((packed)) wlan_snap_t;

/* Circular include trick */
struct wlandevice;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/wlan-ng/p80211hdr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ typedef struct p80211_hdr_a3
u8 a2[WLAN_ADDR_LEN];
u8 a3[WLAN_ADDR_LEN];
u16 seq;
} __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t;
} __attribute__((packed)) p80211_hdr_a3_t;

typedef struct p80211_hdr_a4
{
Expand All @@ -240,13 +240,13 @@ typedef struct p80211_hdr_a4
u8 a3[WLAN_ADDR_LEN];
u16 seq;
u8 a4[WLAN_ADDR_LEN];
} __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t;
} __attribute__((packed)) p80211_hdr_a4_t;

typedef union p80211_hdr
{
p80211_hdr_a3_t a3;
p80211_hdr_a4_t a4;
} __WLAN_ATTRIB_PACK__ p80211_hdr_t;
} __attribute__((packed)) p80211_hdr_t;


/*================================================================*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/wlan-ng/p80211ioctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ typedef struct p80211ioctl_req
u32 magic;
u16 len;
u32 result;
} __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;
} __attribute__((packed)) p80211ioctl_req_t;


/*================================================================*/
Expand Down
30 changes: 15 additions & 15 deletions drivers/staging/wlan-ng/p80211metastruct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typedef struct p80211msg_dot11req_mibget
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk392_t mibattribute ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t;
} __attribute__((packed)) p80211msg_dot11req_mibget_t;

typedef struct p80211msg_dot11req_mibset
{
Expand All @@ -64,7 +64,7 @@ typedef struct p80211msg_dot11req_mibset
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk392_t mibattribute ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;
} __attribute__((packed)) p80211msg_dot11req_mibset_t;

typedef struct p80211msg_dot11req_scan
{
Expand All @@ -85,7 +85,7 @@ typedef struct p80211msg_dot11req_scan
p80211item_uint32_t resultcode ;
p80211item_uint32_t numbss ;
p80211item_uint32_t append ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_t;
} __attribute__((packed)) p80211msg_dot11req_scan_t;

typedef struct p80211msg_dot11req_scan_results
{
Expand Down Expand Up @@ -134,7 +134,7 @@ typedef struct p80211msg_dot11req_scan_results
p80211item_uint32_t supprate6 ;
p80211item_uint32_t supprate7 ;
p80211item_uint32_t supprate8 ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_results_t;
} __attribute__((packed)) p80211msg_dot11req_scan_results_t;

typedef struct p80211msg_dot11req_start
{
Expand Down Expand Up @@ -173,7 +173,7 @@ typedef struct p80211msg_dot11req_start
p80211item_uint32_t operationalrate7 ;
p80211item_uint32_t operationalrate8 ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_start_t;
} __attribute__((packed)) p80211msg_dot11req_start_t;

typedef struct p80211msg_lnxreq_ifstate
{
Expand All @@ -182,7 +182,7 @@ typedef struct p80211msg_lnxreq_ifstate
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t ifstate ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t;
} __attribute__((packed)) p80211msg_lnxreq_ifstate_t;

typedef struct p80211msg_lnxreq_wlansniff
{
Expand All @@ -197,7 +197,7 @@ typedef struct p80211msg_lnxreq_wlansniff
p80211item_uint32_t stripfcs ;
p80211item_uint32_t packet_trunc ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_wlansniff_t;
} __attribute__((packed)) p80211msg_lnxreq_wlansniff_t;

typedef struct p80211msg_lnxreq_hostwep
{
Expand All @@ -207,7 +207,7 @@ typedef struct p80211msg_lnxreq_hostwep
p80211item_uint32_t resultcode ;
p80211item_uint32_t decrypt ;
p80211item_uint32_t encrypt ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_hostwep_t;
} __attribute__((packed)) p80211msg_lnxreq_hostwep_t;

typedef struct p80211msg_lnxreq_commsquality
{
Expand All @@ -219,7 +219,7 @@ typedef struct p80211msg_lnxreq_commsquality
p80211item_uint32_t link ;
p80211item_uint32_t level ;
p80211item_uint32_t noise ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_commsquality_t;
} __attribute__((packed)) p80211msg_lnxreq_commsquality_t;

typedef struct p80211msg_lnxreq_autojoin
{
Expand All @@ -230,7 +230,7 @@ typedef struct p80211msg_lnxreq_autojoin
u8 pad_19D[3] ;
p80211item_uint32_t authtype ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;
} __attribute__((packed)) p80211msg_lnxreq_autojoin_t;

typedef struct p80211msg_p2req_readpda
{
Expand All @@ -239,7 +239,7 @@ typedef struct p80211msg_p2req_readpda
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk1024_t pda ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;
} __attribute__((packed)) p80211msg_p2req_readpda_t;

typedef struct p80211msg_p2req_ramdl_state
{
Expand All @@ -249,7 +249,7 @@ typedef struct p80211msg_p2req_ramdl_state
p80211item_uint32_t enable ;
p80211item_uint32_t exeaddr ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_state_t;
} __attribute__((packed)) p80211msg_p2req_ramdl_state_t;

typedef struct p80211msg_p2req_ramdl_write
{
Expand All @@ -260,7 +260,7 @@ typedef struct p80211msg_p2req_ramdl_write
p80211item_uint32_t len ;
p80211item_unk4096_t data ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_write_t;
} __attribute__((packed)) p80211msg_p2req_ramdl_write_t;

typedef struct p80211msg_p2req_flashdl_state
{
Expand All @@ -269,7 +269,7 @@ typedef struct p80211msg_p2req_flashdl_state
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t;
} __attribute__((packed)) p80211msg_p2req_flashdl_state_t;

typedef struct p80211msg_p2req_flashdl_write
{
Expand All @@ -280,6 +280,6 @@ typedef struct p80211msg_p2req_flashdl_write
p80211item_uint32_t len ;
p80211item_unk4096_t data ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_write_t;
} __attribute__((packed)) p80211msg_p2req_flashdl_write_t;

#endif
18 changes: 9 additions & 9 deletions drivers/staging/wlan-ng/p80211mgmt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,23 +247,23 @@ typedef struct wlan_ie
{
u8 eid;
u8 len;
} __WLAN_ATTRIB_PACK__ wlan_ie_t;
} __attribute__((packed)) wlan_ie_t;

/*-- Service Set Identity (SSID) -----------------*/
typedef struct wlan_ie_ssid
{
u8 eid;
u8 len;
u8 ssid[1]; /* may be zero, ptrs may overlap */
} __WLAN_ATTRIB_PACK__ wlan_ie_ssid_t;
} __attribute__((packed)) wlan_ie_ssid_t;

/*-- Supported Rates -----------------------------*/
typedef struct wlan_ie_supp_rates
{
u8 eid;
u8 len;
u8 rates[1]; /* had better be at LEAST one! */
} __WLAN_ATTRIB_PACK__ wlan_ie_supp_rates_t;
} __attribute__((packed)) wlan_ie_supp_rates_t;

/*-- FH Parameter Set ----------------------------*/
typedef struct wlan_ie_fh_parms
Expand All @@ -274,15 +274,15 @@ typedef struct wlan_ie_fh_parms
u8 hopset;
u8 hoppattern;
u8 hopindex;
} __WLAN_ATTRIB_PACK__ wlan_ie_fh_parms_t;
} __attribute__((packed)) wlan_ie_fh_parms_t;

/*-- DS Parameter Set ----------------------------*/
typedef struct wlan_ie_ds_parms
{
u8 eid;
u8 len;
u8 curr_ch;
} __WLAN_ATTRIB_PACK__ wlan_ie_ds_parms_t;
} __attribute__((packed)) wlan_ie_ds_parms_t;

/*-- CF Parameter Set ----------------------------*/

Expand All @@ -294,7 +294,7 @@ typedef struct wlan_ie_cf_parms
u8 cfp_period;
u16 cfp_maxdur;
u16 cfp_durremaining;
} __WLAN_ATTRIB_PACK__ wlan_ie_cf_parms_t;
} __attribute__((packed)) wlan_ie_cf_parms_t;

/*-- TIM ------------------------------------------*/
typedef struct wlan_ie_tim
Expand All @@ -305,23 +305,23 @@ typedef struct wlan_ie_tim
u8 dtim_period;
u8 bitmap_ctl;
u8 virt_bm[1];
} __WLAN_ATTRIB_PACK__ wlan_ie_tim_t;
} __attribute__((packed)) wlan_ie_tim_t;

/*-- IBSS Parameter Set ---------------------------*/
typedef struct wlan_ie_ibss_parms
{
u8 eid;
u8 len;
u16 atim_win;
} __WLAN_ATTRIB_PACK__ wlan_ie_ibss_parms_t;
} __attribute__((packed)) wlan_ie_ibss_parms_t;

/*-- Challenge Text ------------------------------*/
typedef struct wlan_ie_challenge
{
u8 eid;
u8 len;
u8 challenge[1];
} __WLAN_ATTRIB_PACK__ wlan_ie_challenge_t;
} __attribute__((packed)) wlan_ie_challenge_t;

/*-------------------------------------------------*/
/* Frame Types */
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/wlan-ng/p80211msg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ typedef struct p80211msg
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
} __WLAN_ATTRIB_PACK__ p80211msg_t;
} __attribute__((packed)) p80211msg_t;

typedef struct p80211msgd
{
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
u8 args[0];
} __WLAN_ATTRIB_PACK__ p80211msgd_t;
} __attribute__((packed)) p80211msgd_t;

/*================================================================*/
/* Extern Declarations */
Expand Down
Loading

0 comments on commit 9cba46d

Please sign in to comment.