Mon Jun 30 21:33:40 2014 UTC ()

Apply OpenBSD src/sys/dev/pci/if_wpireg.h 1.17.


(jakllsch)

diff -r1.10 -r1.11 src/sys/dev/pci/if_wpireg.h

--- src/sys/dev/pci/if_wpireg.h 2014/06/30 21:17:18	1.10
+++ src/sys/dev/pci/if_wpireg.h 2014/06/30 21:33:40	1.11

 @@ -1,15 +1,15 @@
-/*	$NetBSD: if_wpireg.h,v 1.10 2014/06/30 21:17:18 jakllsch Exp $	*/
+/*	$NetBSD: if_wpireg.h,v 1.11 2014/06/30 21:33:40 jakllsch Exp $	*/
-/*	$OpenBSD: if_wpireg.h,v 1.16 2007/07/10 18:29:38 damien Exp $	*/
+/*	$OpenBSD: if_wpireg.h,v 1.17 2007/07/24 16:07:47 damien Exp $	*/
 /*-
  * Copyright (c) 2006, 2007
  *	Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -192,26 +192,27 @@ struct wpi_tx_desc {
 struct wpi_tx_stat {
 	uint8_t		nrts;
 	uint8_t		ntries;
 	uint8_t		nkill;
 	uint8_t		rate;
 	uint32_t	duration;
 	uint32_t	status;
 } __packed;
 struct wpi_rx_desc {
 	uint32_t	len;
 	uint8_t		type;
 #define WPI_UC_READY		  1
 #define WPI_ADD_NODE_DONE	 24
 #define WPI_RX_DONE		 27
 #define WPI_TX_DONE		 28
 #define WPI_START_SCAN		130
 #define WPI_STOP_SCAN		132
 #define WPI_STATE_CHANGED	161
 	uint8_t		flags;
 	uint8_t		idx;
 	uint8_t		qid;
 } __packed;
 struct wpi_rx_stat {
 	uint8_t		len;
 @@ -331,45 +332,47 @@ struct wpi_wme_setup {
 /* structure for command WPI_CMD_TSF */
 struct wpi_cmd_tsf {
 	uint64_t	tstamp;
 	uint16_t	bintval;
 	uint16_t	atim;
 	uint32_t	binitval;
 	uint16_t	lintval;
 	uint16_t	reserved;
 } __packed;
 /* structure for WPI_CMD_ADD_NODE */
 struct wpi_node_info {
 	uint8_t		control;
-#define WPI_NODE_UPDATE	(1 << 0)
+#define WPI_NODE_UPDATE		(1 << 0)
 	uint8_t		reserved1[3];
 	uint8_t		bssid[IEEE80211_ADDR_LEN];
 	uint16_t	reserved2;
 	uint8_t		id;
 #define WPI_ID_BSS		0
 #define WPI_ID_BROADCAST	24
 	uint8_t		flags;
 #define WPI_FLAG_SET_KEY	(1 << 0)
 	uint16_t	reserved3;
-	uint16_t	key_flags;
+	uint16_t	security;
 	uint8_t		tkip;
 	uint8_t		reserved4;
 	uint16_t	ttak[5];
 	uint16_t	reserved5;
 	uint8_t		key[IEEE80211_KEYBUF_SIZE];
 	uint32_t	action;
-#define WPI_ACTION_SET_RATE	4
+#define WPI_ACTION_SET_RATE	(1 << 2)
 	uint32_t	mask;
 	uint16_t	tid;
 	uint8_t		rate;
 	uint8_t		antenna;
 #define WPI_ANTENNA_A		(1 << 6)
 #define WPI_ANTENNA_B		(1 << 7)
 #define WPI_ANTENNA_BOTH	(WPI_ANTENNA_A | WPI_ANTENNA_B)
 	uint8_t		add_imm;
 	uint8_t		del_imm;
 	uint16_t	add_imm_start;
 } __packed;
 @@ -381,26 +384,31 @@ struct wpi_cmd_data {
 	uint32_t	flags;
 #define WPI_TX_NEED_RTS		(1 <<  1)
 #define WPI_TX_NEED_CTS		(1 <<  2)
 #define WPI_TX_NEED_ACK		(1 <<  3)
 #define WPI_TX_FULL_TXOP	(1 <<  7)
 #define WPI_TX_BT_DISABLE	(1 << 12)	/* bluetooth coexistence */
 #define WPI_TX_AUTO_SEQ		(1 << 13)
 #define WPI_TX_INSERT_TSTAMP	(1 << 16)
 	uint8_t		rate;
 	uint8_t		id;
 	uint8_t		tid;
 	uint8_t		security;
 #define WPI_CIPHER_WEP40	1
 #define WPI_CIPHER_CCMP		2
 #define WPI_CIPHER_TKIP		3
 #define WPI_CIPHER_WEP104	9
 	uint8_t		key[IEEE80211_KEYBUF_SIZE];
 	uint8_t		tkip[IEEE80211_WEP_MICLEN];
 	uint32_t	fnext;
 	uint32_t	lifetime;
 #define WPI_LIFETIME_INFINITE	0xffffffff
 	uint8_t		ofdm_mask;
 	uint8_t		cck_mask;
 	uint8_t		rts_ntries;
 	uint8_t		data_ntries;
 	uint16_t	timeout;
 	uint16_t	txop;
 } __packed;