PERFORCE change 133065 for review
Sam Leffler
sam at FreeBSD.org
Fri Jan 11 12:47:46 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=133065
Change 133065 by sam at sam_ebb on 2008/01/11 20:46:50
update for vap create api change
Affected files ...
.. //depot/projects/vap/sys/dev/ipw/if_ipw.c#6 edit
.. //depot/projects/vap/sys/dev/iwi/if_iwi.c#10 edit
.. //depot/projects/vap/sys/dev/ral/rt2560.c#4 edit
.. //depot/projects/vap/sys/dev/ral/rt2661.c#4 edit
.. //depot/projects/vap/sys/dev/usb/if_rum.c#4 edit
.. //depot/projects/vap/sys/dev/usb/if_ural.c#6 edit
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#4 edit
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#4 edit
Differences ...
==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#6 (text+ko) ====
@@ -109,7 +109,8 @@
static struct ieee80211vap *ipw_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void ipw_vap_delete(struct ieee80211vap *);
static int ipw_dma_alloc(struct ipw_softc *);
static void ipw_release(struct ipw_softc *);
@@ -433,7 +434,8 @@
static struct ieee80211vap *
ipw_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct ipw_vap *ivp;
struct ieee80211vap *vap;
@@ -445,7 +447,7 @@
if (ivp == NULL)
return NULL;
vap = &ivp->vap;
- ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid);
+ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
/* override with driver methods */
ivp->newstate = vap->iv_newstate;
vap->iv_newstate = ipw_newstate;
==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#10 (text+ko) ====
@@ -123,7 +123,8 @@
static struct ieee80211vap *iwi_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void iwi_vap_delete(struct ieee80211vap *);
static void iwi_dma_map_addr(void *, bus_dma_segment_t *, int, int);
static int iwi_alloc_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *,
@@ -498,7 +499,8 @@
static struct ieee80211vap *
iwi_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct iwi_vap *ivp;
struct ieee80211vap *vap;
@@ -510,7 +512,7 @@
if (ivp == NULL)
return NULL;
vap = &ivp->iwi_vap;
- ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid);
+ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
vap->iv_bmissthreshold = 10; /* override default */
/* override with driver methods */
ivp->iwi_newstate = vap->iv_newstate;
==== //depot/projects/vap/sys/dev/ral/rt2560.c#4 (text) ====
@@ -80,7 +80,8 @@
static struct ieee80211vap *rt2560_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void rt2560_vap_delete(struct ieee80211vap *);
static void rt2560_dma_map_addr(void *, bus_dma_segment_t *, int,
int);
@@ -369,7 +370,8 @@
static struct ieee80211vap *
rt2560_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rt2560_vap *rvp;
struct ieee80211vap *vap;
@@ -383,7 +385,7 @@
vap = &rvp->ral_vap;
/* enable s/w bmiss handling for sta mode */
ieee80211_vap_setup(ic, vap, name, unit, opmode,
- flags | IEEE80211_CLONE_NOBEACONS, bssid);
+ flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
vap->iv_reset = rt2560_reset;
/* override state transition machine */
==== //depot/projects/vap/sys/dev/ral/rt2661.c#4 (text) ====
@@ -78,7 +78,8 @@
static struct ieee80211vap *rt2661_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void rt2661_vap_delete(struct ieee80211vap *);
static void rt2661_dma_map_addr(void *, bus_dma_segment_t *, int,
int);
@@ -388,7 +389,8 @@
static struct ieee80211vap *
rt2661_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rt2661_vap *rvp;
struct ieee80211vap *vap;
@@ -402,7 +404,7 @@
vap = &rvp->ral_vap;
/* enable s/w bmiss handling for sta mode */
ieee80211_vap_setup(ic, vap, name, unit, opmode,
- flags | IEEE80211_CLONE_NOBEACONS, bssid);
+ flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
vap->iv_reset = rt2661_reset;
/* override state transition machine */
==== //depot/projects/vap/sys/dev/usb/if_rum.c#4 (text+ko) ====
@@ -127,7 +127,8 @@
static struct ieee80211vap *rum_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void rum_vap_delete(struct ieee80211vap *);
static int rum_alloc_tx_list(struct rum_softc *);
static void rum_free_tx_list(struct rum_softc *);
@@ -577,7 +578,8 @@
static struct ieee80211vap *
rum_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rum_vap *rvp;
struct ieee80211vap *vap;
@@ -591,7 +593,7 @@
vap = &rvp->vap;
/* enable s/w bmiss handling for sta mode */
ieee80211_vap_setup(ic, vap, name, unit, opmode,
- flags | IEEE80211_CLONE_NOBEACONS, bssid);
+ flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
/* override state transition machine */
rvp->newstate = vap->iv_newstate;
==== //depot/projects/vap/sys/dev/usb/if_ural.c#6 (text+ko) ====
@@ -117,7 +117,8 @@
static struct ieee80211vap *ural_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void ural_vap_delete(struct ieee80211vap *);
static int ural_alloc_tx_list(struct ural_softc *);
static void ural_free_tx_list(struct ural_softc *);
@@ -567,7 +568,8 @@
static struct ieee80211vap *
ural_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct ural_vap *uvp;
struct ieee80211vap *vap;
@@ -581,7 +583,7 @@
vap = &uvp->vap;
/* enable s/w bmiss handling for sta mode */
ieee80211_vap_setup(ic, vap, name, unit, opmode,
- flags | IEEE80211_CLONE_NOBEACONS, bssid);
+ flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
vap->iv_reset = ural_reset;
/* override state transition machine */
==== //depot/projects/vap/sys/dev/usb/if_zyd.c#4 (text+ko) ====
@@ -154,7 +154,8 @@
static struct ieee80211vap *zyd_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void zyd_vap_delete(struct ieee80211vap *);
static int zyd_attachhook(struct zyd_softc *);
static int zyd_complete_attach(struct zyd_softc *);
@@ -470,7 +471,8 @@
static struct ieee80211vap *
zyd_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct zyd_vap *zvp;
struct ieee80211vap *vap;
@@ -484,7 +486,7 @@
vap = &zvp->vap;
/* enable s/w bmiss handling for sta mode */
ieee80211_vap_setup(ic, vap, name, unit, opmode,
- flags | IEEE80211_CLONE_NOBEACONS, bssid);
+ flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
/* override state transition machine */
zvp->newstate = vap->iv_newstate;
==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#4 (text+ko) ====
@@ -154,7 +154,8 @@
static struct ieee80211vap *wpi_vap_create(struct ieee80211com *,
const char name[IFNAMSIZ], int unit, int opmode,
- int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]);
+ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void wpi_vap_delete(struct ieee80211vap *);
static int wpi_dma_contig_alloc(struct wpi_softc *, struct wpi_dma_info *,
void **, bus_size_t, bus_size_t, int);
@@ -800,7 +801,8 @@
static struct ieee80211vap *
wpi_vap_create(struct ieee80211com *ic,
const char name[IFNAMSIZ], int unit, int opmode, int flags,
- const uint8_t bssid[IEEE80211_ADDR_LEN])
+ const uint8_t bssid[IEEE80211_ADDR_LEN],
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct wpi_vap *wvp;
struct ieee80211vap *vap;
@@ -812,7 +814,7 @@
if (wvp == NULL)
return NULL;
vap = &wvp->vap;
- ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid);
+ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
/* override with driver methods */
wvp->newstate = vap->iv_newstate;
vap->iv_newstate = wpi_newstate;
More information about the p4-projects
mailing list