Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare to consolidate 802.11 media handling (which is handled in 

code duplicated by each driver, now) into the 802.11 framework.
This commit is contained in:
dyoung 2003-07-06 07:54:43 +00:00
parent 321cda0a59
commit 030634087a
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/ic/an.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: an.c,v 1.24 2003/01/31 00:26:27 thorpej Exp $ */
/* $NetBSD: an.c,v 1.25 2003/07/06 07:54:43 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.24 2003/01/31 00:26:27 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.25 2003/07/06 07:54:43 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -126,9 +126,9 @@ __KERNEL_RCSID(0, "$NetBSD: an.c,v 1.24 2003/01/31 00:26:27 thorpej Exp $");
#include <net/if_arp.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
#include <net/if_ieee80211.h>
#include <net/if_types.h>
#include <net/if_media.h>
#ifdef INET
#include <netinet/in.h>

5
sys/net/if.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if.c,v 1.123 2003/06/29 22:31:50 fvdl Exp $ */
/* $NetBSD: if.c,v 1.124 2003/07/06 07:54:43 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.123 2003/06/29 22:31:50 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.124 2003/07/06 07:54:43 dyoung Exp $");
#include "opt_inet.h"
@ -129,6 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.123 2003/06/29 22:31:50 fvdl Exp $");
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
#include <net/if_ieee80211.h>
#include <net/if_types.h>
#include <net/radix.h>

11
sys/net/if_ieee80211.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ieee80211.h,v 1.32 2003/05/16 01:26:17 dyoung Exp $ */
/* $NetBSD: if_ieee80211.h,v 1.33 2003/07/06 07:54:43 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -515,9 +515,14 @@ struct ieee80211com {
u_int8_t ic_sup_rates[IEEE80211_RATE_SIZE];
u_char ic_chan_avail[roundup(IEEE80211_CHAN_MAX,NBBY)];
u_char ic_chan_active[roundup(IEEE80211_CHAN_MAX, NBBY)];
u_char ic_chan_scan[roundup(IEEE80211_CHAN_MAX, NBBY)];
struct ifqueue ic_mgtq;
struct ifqueue ic_pwrsaveq;
int ic_flags;
int ic_hdrlen; /* either 0 or extended header
* length, e.g. for addr4
*/
enum ieee80211_phytype ic_phytype;
enum ieee80211_opmode ic_opmode;
enum ieee80211_state ic_state;
@ -544,6 +549,7 @@ struct ieee80211com {
u_int32_t ic_iv; /* initial vector for wep */
u_int32_t ic_aid_bitmap[IEEE80211_MAX_AID / 32 + 1];
u_int16_t ic_max_aid;
struct ifmedia ic_media;
};
#ifdef __NetBSD__
#define ic_if ic_ec.ec_if
@ -553,6 +559,9 @@ struct ieee80211com {
#endif
#define ic_softc ic_if.if_softc
#define IEEE80211_HEADER_LEN(ic) (((ic)->ic_hdrlen > 0) \
? (ic)->ic_hdrlen : sizeof(struct ieee80211_frame))
#define IEEE80211_SEND_MGMT(ic,ni,type,arg) do { \
if ((ic)->ic_send_mgmt[(type)>>IEEE80211_FC0_SUBTYPE_SHIFT] != NULL) \
(*(ic)->ic_send_mgmt[(type)>>IEEE80211_FC0_SUBTYPE_SHIFT]) \