diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-dev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h index 9ee849d669f3..2d87dba2cfa3 100644 --- a/drivers/net/wireless/iwlegacy/iwl-dev.h +++ b/drivers/net/wireless/iwlegacy/iwl-dev.h | |||
@@ -134,7 +134,7 @@ struct iwl_queue { | |||
134 | * space more than this */ | 134 | * space more than this */ |
135 | int high_mark; /* high watermark, stop queue if free | 135 | int high_mark; /* high watermark, stop queue if free |
136 | * space less than this */ | 136 | * space less than this */ |
137 | } __packed; | 137 | }; |
138 | 138 | ||
139 | /* One for each TFD */ | 139 | /* One for each TFD */ |
140 | struct iwl_tx_info { | 140 | struct iwl_tx_info { |
@@ -290,6 +290,7 @@ enum { | |||
290 | CMD_SIZE_HUGE = (1 << 0), | 290 | CMD_SIZE_HUGE = (1 << 0), |
291 | CMD_ASYNC = (1 << 1), | 291 | CMD_ASYNC = (1 << 1), |
292 | CMD_WANT_SKB = (1 << 2), | 292 | CMD_WANT_SKB = (1 << 2), |
293 | CMD_MAPPED = (1 << 3), | ||
293 | }; | 294 | }; |
294 | 295 | ||
295 | #define DEF_CMD_PAYLOAD_SIZE 320 | 296 | #define DEF_CMD_PAYLOAD_SIZE 320 |
@@ -1076,7 +1077,6 @@ struct iwl_priv { | |||
1076 | spinlock_t hcmd_lock; /* protect hcmd */ | 1077 | spinlock_t hcmd_lock; /* protect hcmd */ |
1077 | spinlock_t reg_lock; /* protect hw register access */ | 1078 | spinlock_t reg_lock; /* protect hw register access */ |
1078 | struct mutex mutex; | 1079 | struct mutex mutex; |
1079 | struct mutex sync_cmd_mutex; /* enable serialization of sync commands */ | ||
1080 | 1080 | ||
1081 | /* basic pci-network driver stuff */ | 1081 | /* basic pci-network driver stuff */ |
1082 | struct pci_dev *pci_dev; | 1082 | struct pci_dev *pci_dev; |