d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Reduce the gratuitous differences with NetBSD.

Browse Source 
o OpenBSD's wiconfig tells me that a value of '2' is for sony wireless
  cards, 1 is for lucent (which we already knew) and '5' is for embedded
  lucent cards.
o Move some RID definitions to if_wavelan_ieee.h and use NetBSD names
  more often.

# more work is still needed in this area.
This commit is contained in:
Warner Losh 2002-04-04 06:28:16 +00:00
parent 65a0653eb7
commit 276bdee1b5
3 changed files with 34 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/wi/if_wavelan_ieee.h
View File

@ -193,6 +193,26 @@ struct wi_counters {
#define WI_RID_MCAST_PM_BUF 0xFC17 /* PM buffering of mcast */
#define WI_RID_ENCRYPTION 0xFC20 /* enable/disable WEP */
#define WI_RID_AUTHTYPE 0xFC21 /* specify authentication type */
#define WI_RID_P2_TX_CRYPT_KEY 0xFC23
#define WI_RID_P2_CRYPT_KEY0 0xFC24
#define WI_RID_P2_CRYPT_KEY1 0xFC25
#define WI_RID_MICROWAVE_OVEN 0xFC25
#define WI_RID_P2_CRYPT_KEY2 0xFC26
#define WI_RID_P2_CRYPT_KEY3 0xFC27
#define WI_RID_P2_ENCRYPTION 0xFC28
#define PRIVACY_INVOKED 0x01
#define EXCLUDE_UNENCRYPTED 0x02
#define HOST_ENCRYPT 0x10
#define IV_EVERY_FRAME 0x00 /* IV = Initialization Vector */
#define IV_EVERY10_FRAME 0x20 /* every 10 frame IV reuse */
#define IV_EVERY50_FRAME 0x40 /* every 50 frame IV reuse */
#define IV_EVERY100_FRAME 0x60 /* every 100 frame IV reuse */
#define HOST_DECRYPT 0x80
#define WI_RID_WEP_MAPTABLE 0xFC29
#define WI_RID_AUTH_CNTL 0xFC2A
#define WI_RID_ROAMING_MODE 0xFC2D
#define WI_RID_BASIC_RATE 0xFCB3
#define WI_RID_SUPPORT_RATE 0xFCB4
/*
* Network parameters, dynamic configuration entities

11
sys/dev/wi/if_wi.c
View File

@ -384,8 +384,13 @@ wi_get_id(sc, dev)
printf("RF:PRISM3(Mini-PCI)");
break;
case WI_NIC_LUCENT:
case WI_NIC_LUCENT_ALT:
printf("Lucent Technologies, WaveLAN/IEEE");
printf("Lucent WaveLAN");
break;
case WI_NIC_SONY:
printf("Sony");
break;
case WI_NIC_LUCENT_EMBEDDED:
printf("Lucent WaveLAN (embedded)");
break;
default:
if (le16toh(ver.wi_ver[0]) & 0x8000)
@ -1295,7 +1300,7 @@ wi_setmulti(sc)
bzero((char *)&mcast, sizeof(mcast));
mcast.wi_type = WI_RID_MCAST;
mcast.wi_type = WI_RID_MCAST_LIST;
mcast.wi_len = (3 * 16) + 1;
if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {

63
sys/dev/wi/if_wireg.h
View File

@ -370,8 +370,9 @@ struct wi_ltv_ver {
u_int16_t wi_len;
u_int16_t wi_type;
u_int16_t wi_ver[4];
#define WI_NIC_LUCENT 0x0001 /* Emperically derived */
#define WI_NIC_LUCENT_ALT 0x0005 /* Emperically derived */
#define WI_NIC_LUCENT 0x0001
#define WI_NIC_SONY 0x0002
#define WI_NIC_LUCENT_EMBEDDED 0x0005
#define WI_NIC_EVB2 0x8000
#define WI_NIC_HWB3763 0x8001
#define WI_NIC_HWB3163 0x8002
@ -475,10 +476,8 @@ struct wi_ltv_macaddr {
};
/*
* Station set identification (SSID).
* Station set identification (SSID). (0xFC02, 0xFC04)
*/
#define WI_RID_DESIRED_SSID 0xFC02
#define WI_RID_OWN_SSID 0xFC04
struct wi_ltv_ssid {
u_int16_t wi_len;
u_int16_t wi_type;
@ -486,74 +485,24 @@ struct wi_ltv_ssid {
};
/*
* Set communications channel (radio frequency).
* Set our station name. (0xFC0E)
*/
#define WI_RID_OWN_CHNL 0xFC03
/*
* Frame data size.
*/
#define WI_RID_MAX_DATALEN 0xFC07
/*
* ESS power management enable
*/
#define WI_RID_PM_ENABLED 0xFC09
/*
* ESS max PM sleep internal
*/
#define WI_RID_MAX_SLEEP 0xFC0C
/*
* Set our station name.
*/
#define WI_RID_NODENAME 0xFC0E
struct wi_ltv_nodename {
u_int16_t wi_len;
u_int16_t wi_type;
u_int16_t wi_nodename[17];
};
#define WI_RID_AUTH_CNTL 0xFC2A
/*
* Multicast addresses to be put in filter. We're
* allowed up to 16 addresses in the filter.
* allowed up to 16 addresses in the filter. (0xFC80)
*/
#define WI_RID_MCAST 0xFC80
struct wi_ltv_mcast {
u_int16_t wi_len;
u_int16_t wi_type;
struct ether_addr wi_mcast[16];
};
/*
* Create IBSS.
*/
#define WI_RID_CREATE_IBSS 0xFC81
#define WI_RID_FRAG_THRESH 0xFC82
#define WI_RID_RTS_THRESH 0xFC83
/*
* TX rate control
* 0 == Fixed 1mbps
* 1 == Fixed 2mbps
* 2 == auto fallback
*/
#define WI_RID_TX_RATE 0xFC84
/*
* promiscuous mode.
*/
#define WI_RID_PROMISC 0xFC85
/*
* Auxiliary Timer tick interval
*/
#define WI_RID_TICK_TIME 0xFCE0
/*
* Information frame types.
*/