Skip to content

Commit

Permalink
Staging: wlan-ng: fixed packed checkpatch warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Bas van den Berg <b.van.den.berg.nl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bas van den Berg authored and Greg Kroah-Hartman committed Feb 4, 2011
1 parent 37af07d commit 7d3864d
Show file tree
Hide file tree
Showing 8 changed files with 127 additions and 127 deletions.
156 changes: 78 additions & 78 deletions drivers/staging/wlan-ng/hfa384x.h

Large diffs are not rendered by default.

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

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

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

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

struct p80211_hdr_a4 {
u16 fc;
Expand All @@ -164,12 +164,12 @@ struct p80211_hdr_a4 {
u8 a3[ETH_ALEN];
u16 seq;
u8 a4[ETH_ALEN];
} __attribute__ ((packed));
} __packed;

union p80211_hdr {
struct p80211_hdr_a3 a3;
struct p80211_hdr_a4 a4;
} __attribute__ ((packed));
} __packed;

/* Frame and header length macros */

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/wlan-ng/p80211ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ struct p80211ioctl_req {
u32 magic;
u16 len;
u32 result;
} __attribute__ ((packed));
} __packed;

#endif /* _P80211IOCTL_H */
30 changes: 15 additions & 15 deletions drivers/staging/wlan-ng/p80211metastruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ struct p80211msg_dot11req_mibget {
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk392_t mibattribute;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_dot11req_mibset {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk392_t mibattribute;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_dot11req_scan {
u32 msgcode;
Expand All @@ -81,7 +81,7 @@ struct p80211msg_dot11req_scan {
p80211item_uint32_t resultcode;
p80211item_uint32_t numbss;
p80211item_uint32_t append;
} __attribute__ ((packed));
} __packed;

struct p80211msg_dot11req_scan_results {
u32 msgcode;
Expand Down Expand Up @@ -130,7 +130,7 @@ struct p80211msg_dot11req_scan_results {
p80211item_uint32_t supprate6;
p80211item_uint32_t supprate7;
p80211item_uint32_t supprate8;
} __attribute__ ((packed));
} __packed;

struct p80211msg_dot11req_start {
u32 msgcode;
Expand Down Expand Up @@ -168,15 +168,15 @@ struct p80211msg_dot11req_start {
p80211item_uint32_t operationalrate7;
p80211item_uint32_t operationalrate8;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_lnxreq_ifstate {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t ifstate;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_lnxreq_wlansniff {
u32 msgcode;
Expand All @@ -190,7 +190,7 @@ struct p80211msg_lnxreq_wlansniff {
p80211item_uint32_t stripfcs;
p80211item_uint32_t packet_trunc;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_lnxreq_hostwep {
u32 msgcode;
Expand All @@ -199,7 +199,7 @@ struct p80211msg_lnxreq_hostwep {
p80211item_uint32_t resultcode;
p80211item_uint32_t decrypt;
p80211item_uint32_t encrypt;
} __attribute__ ((packed));
} __packed;

struct p80211msg_lnxreq_commsquality {
u32 msgcode;
Expand All @@ -211,7 +211,7 @@ struct p80211msg_lnxreq_commsquality {
p80211item_uint32_t level;
p80211item_uint32_t noise;
p80211item_uint32_t txrate;
} __attribute__ ((packed));
} __packed;

struct p80211msg_lnxreq_autojoin {
u32 msgcode;
Expand All @@ -221,15 +221,15 @@ struct p80211msg_lnxreq_autojoin {
u8 pad_19D[3];
p80211item_uint32_t authtype;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_p2req_readpda {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_unk1024_t pda;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_p2req_ramdl_state {
u32 msgcode;
Expand All @@ -238,7 +238,7 @@ struct p80211msg_p2req_ramdl_state {
p80211item_uint32_t enable;
p80211item_uint32_t exeaddr;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_p2req_ramdl_write {
u32 msgcode;
Expand All @@ -248,15 +248,15 @@ struct p80211msg_p2req_ramdl_write {
p80211item_uint32_t len;
p80211item_unk4096_t data;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_p2req_flashdl_state {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
p80211item_uint32_t enable;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

struct p80211msg_p2req_flashdl_write {
u32 msgcode;
Expand All @@ -266,6 +266,6 @@ struct p80211msg_p2req_flashdl_write {
p80211item_uint32_t len;
p80211item_unk4096_t data;
p80211item_uint32_t resultcode;
} __attribute__ ((packed));
} __packed;

#endif
18 changes: 9 additions & 9 deletions drivers/staging/wlan-ng/p80211mgmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,21 +222,21 @@
typedef struct wlan_ie {
u8 eid;
u8 len;
} __attribute__ ((packed)) wlan_ie_t;
} __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 */
} __attribute__ ((packed)) wlan_ie_ssid_t;
} __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! */
} __attribute__ ((packed)) wlan_ie_supp_rates_t;
} __packed wlan_ie_supp_rates_t;

/*-- FH Parameter Set ----------------------------*/
typedef struct wlan_ie_fh_parms {
Expand All @@ -246,14 +246,14 @@ typedef struct wlan_ie_fh_parms {
u8 hopset;
u8 hoppattern;
u8 hopindex;
} __attribute__ ((packed)) wlan_ie_fh_parms_t;
} __packed wlan_ie_fh_parms_t;

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

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

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

/*-- TIM ------------------------------------------*/
typedef struct wlan_ie_tim {
Expand All @@ -274,21 +274,21 @@ typedef struct wlan_ie_tim {
u8 dtim_period;
u8 bitmap_ctl;
u8 virt_bm[1];
} __attribute__ ((packed)) wlan_ie_tim_t;
} __packed wlan_ie_tim_t;

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

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

/*-------------------------------------------------*/
/* Frame Types */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/wlan-ng/p80211msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ struct p80211msg {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
} __attribute__ ((packed));
} __packed;

#endif /* _P80211MSG_H */
Loading

0 comments on commit 7d3864d

Please sign in to comment.