staging: rtl8712: Use __packed instead of __attribute__ ((packed))
According to scripts/checkpatch.pl, the __packed macro from linux/compiler.h should be used. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Michael Fiedler
Greg Kroah-Hartman
parent
36e0b743d2
commit
40878364f1
|
|
@ -4,6 +4,7 @@
|
|||
#include "osdep_service.h"
|
||||
#include "drv_types.h"
|
||||
#include "wifi.h"
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/wireless.h>
|
||||
|
||||
#define MGMT_QUEUE_NUM 5
|
||||
|
|
@ -123,7 +124,7 @@ struct ieee80211_hdr {
|
|||
u8 addr3[ETH_ALEN];
|
||||
u16 seq_ctl;
|
||||
u8 addr4[ETH_ALEN];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_hdr_3addr {
|
||||
u16 frame_ctl;
|
||||
|
|
@ -132,7 +133,7 @@ struct ieee80211_hdr_3addr {
|
|||
u8 addr2[ETH_ALEN];
|
||||
u8 addr3[ETH_ALEN];
|
||||
u16 seq_ctl;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
|
||||
struct ieee80211_hdr_qos {
|
||||
|
|
@ -144,7 +145,7 @@ struct ieee80211_hdr_qos {
|
|||
u16 seq_ctl;
|
||||
u8 addr4[ETH_ALEN];
|
||||
u16 qc;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_hdr_3addr_qos {
|
||||
u16 frame_ctl;
|
||||
|
|
@ -154,7 +155,7 @@ struct ieee80211_hdr_3addr_qos {
|
|||
u8 addr3[ETH_ALEN];
|
||||
u16 seq_ctl;
|
||||
u16 qc;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct eapol {
|
||||
u8 snap[6];
|
||||
|
|
@ -162,7 +163,7 @@ struct eapol {
|
|||
u8 version;
|
||||
u8 type;
|
||||
u16 length;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
|
||||
enum eap_type {
|
||||
|
|
@ -260,7 +261,7 @@ struct ieee80211_snap_hdr {
|
|||
u8 ssap; /* always 0xAA */
|
||||
u8 ctrl; /* always 0x03 */
|
||||
u8 oui[P80211_OUI_LEN]; /* organizational universal id */
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define SNAP_SIZE sizeof(struct ieee80211_snap_hdr)
|
||||
|
||||
|
|
@ -510,7 +511,7 @@ struct ieee80211_security {
|
|||
u8 keys[WEP_KEYS][WEP_KEY_LEN];
|
||||
u8 level;
|
||||
u16 flags;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
|
||||
|
|
@ -555,13 +556,13 @@ struct ieee80211_header_data {
|
|||
struct ieee80211_info_element_hdr {
|
||||
u8 id;
|
||||
u8 len;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_info_element {
|
||||
u8 id;
|
||||
u8 len;
|
||||
u8 data[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
* These are the data types that can make up management packets
|
||||
|
|
@ -574,7 +575,7 @@ struct ieee80211_info_element {
|
|||
u16 listen_interval;
|
||||
struct {
|
||||
u16 association_id:14, reserved:2;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
u32 time_stamp[2];
|
||||
u16 reason;
|
||||
u16 status;
|
||||
|
|
@ -588,7 +589,7 @@ struct ieee80211_authentication {
|
|||
u16 algorithm;
|
||||
u16 transaction;
|
||||
u16 status;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_probe_response {
|
||||
struct ieee80211_header_data header;
|
||||
|
|
@ -596,25 +597,25 @@ struct ieee80211_probe_response {
|
|||
u16 beacon_interval;
|
||||
u16 capability;
|
||||
struct ieee80211_info_element info_element;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_probe_request {
|
||||
struct ieee80211_header_data header;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_assoc_request_frame {
|
||||
struct ieee80211_hdr_3addr header;
|
||||
u16 capability;
|
||||
u16 listen_interval;
|
||||
struct ieee80211_info_element_hdr info_element;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_assoc_response_frame {
|
||||
struct ieee80211_hdr_3addr header;
|
||||
u16 capability;
|
||||
u16 status;
|
||||
u16 aid;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_txb {
|
||||
u8 nr_frags;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define _WIFI_H_
|
||||
|
||||
#include "rtl871x_byteorder.h"
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#ifdef BIT
|
||||
#undef BIT
|
||||
|
|
@ -523,7 +524,7 @@ struct ieee80211_bar {
|
|||
unsigned char ta[6];
|
||||
unsigned short control;
|
||||
unsigned short start_seq_num;
|
||||
} __attribute__((packed));
|
||||
} __packed;
|
||||
|
||||
/* 802.11 BAR control masks */
|
||||
#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000
|
||||
|
|
@ -544,7 +545,7 @@ struct ieee80211_ht_cap {
|
|||
unsigned short extended_ht_cap_info;
|
||||
unsigned int tx_BF_cap_info;
|
||||
unsigned char antenna_selection_info;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/**
|
||||
* struct ieee80211_ht_cap - HT additional information
|
||||
|
|
@ -558,7 +559,7 @@ struct ieee80211_ht_addt_info {
|
|||
unsigned short operation_mode;
|
||||
unsigned short stbc_param;
|
||||
unsigned char basic_set[16];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/* 802.11n HT capabilities masks */
|
||||
#define IEEE80211_HT_CAP_SUP_WIDTH 0x0002
|
||||
|
|
|
|||
Loading…
Reference in New Issue