DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove unnecessary ifname parameter from set_beacon()

Browse source 
The new per-BSS driver context makes this unnecessary.
This commit is contained in:
Jouni Malinen 2010-03-06 22:36:40 +02:00
parent 53f3d6f3e6
commit 8b897f5a17
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ap/ap_drv_ops.c
View file

@ -227,14 +227,14 @@ static int hostapd_set_bss_params(struct hostapd_data *hapd,
} }
static int hostapd_set_beacon(const char *ifname, struct hostapd_data *hapd, static int hostapd_set_beacon(struct hostapd_data *hapd,
const u8 *head, size_t head_len, const u8 *head, size_t head_len,
const u8 *tail, size_t tail_len, int dtim_period, const u8 *tail, size_t tail_len, int dtim_period,
int beacon_int) int beacon_int)
{ {
if (hapd->driver == NULL || hapd->driver->set_beacon == NULL) if (hapd->driver == NULL || hapd->driver->set_beacon == NULL)
return 0; return 0;
return hapd->driver->set_beacon(ifname, hapd->drv_priv, return hapd->driver->set_beacon(hapd->drv_priv,
head, head_len, tail, tail_len, head, head_len, tail, tail_len,
dtim_period, beacon_int); dtim_period, beacon_int);
} }

3
src/ap/beacon.c
View file

@ -429,8 +429,7 @@ void ieee802_11_set_beacon(struct hostapd_data *hapd)
tail_len = tailpos > tail ? tailpos - tail : 0; tail_len = tailpos > tail ? tailpos - tail : 0;
if (hapd->drv.set_beacon(hapd->conf->iface, hapd, if (hapd->drv.set_beacon(hapd, (u8 *) head, head_len,
(u8 *) head, head_len,
tail, tail_len, hapd->conf->dtim_period, tail, tail_len, hapd->conf->dtim_period,
hapd->iconf->beacon_int)) hapd->iconf->beacon_int))
wpa_printf(MSG_ERROR, "Failed to set beacon head/tail or DTIM " wpa_printf(MSG_ERROR, "Failed to set beacon head/tail or DTIM "

2
src/ap/hostapd.h
View file

@ -74,7 +74,7 @@ struct hostapd_driver_ops {
int (*set_radius_acl_expire)(struct hostapd_data *hapd, int (*set_radius_acl_expire)(struct hostapd_data *hapd,
const u8 *mac); const u8 *mac);
int (*set_bss_params)(struct hostapd_data *hapd, int use_protection); int (*set_bss_params)(struct hostapd_data *hapd, int use_protection);
int (*set_beacon)(const char *ifname, struct hostapd_data *hapd, int (*set_beacon)(struct hostapd_data *hapd,
const u8 *head, size_t head_len, const u8 *head, size_t head_len,
const u8 *tail, size_t tail_len, int dtim_period, const u8 *tail, size_t tail_len, int dtim_period,
int beacon_int); int beacon_int);

4
src/drivers/driver.h
View file

@ -1159,7 +1159,6 @@ struct wpa_driver_ops {
/** /**
* set_beacon - Set Beacon frame template * set_beacon - Set Beacon frame template
* @iface: Interface name (main interface or virtual BSS)
* @priv: Private driver interface data * @priv: Private driver interface data
* @head: Beacon head from IEEE 802.11 header to IEs before TIM IE * @head: Beacon head from IEEE 802.11 header to IEs before TIM IE
* @head_len: Length of the head buffer in octets * @head_len: Length of the head buffer in octets
@ -1174,8 +1173,7 @@ struct wpa_driver_ops {
* frame by concatenating the head part with TIM IE generated by the * frame by concatenating the head part with TIM IE generated by the
* driver/firmware and finishing with the tail part. * driver/firmware and finishing with the tail part.
*/ */
int (*set_beacon)(const char *ifname, void *priv, int (*set_beacon)(void *priv, const u8 *head, size_t head_len,
const u8 *head, size_t head_len,
const u8 *tail, size_t tail_len, int dtim_period, const u8 *tail, size_t tail_len, int dtim_period,
int beacon_int); int beacon_int);

4
src/drivers/driver_nl80211.c
View file

@ -2682,7 +2682,7 @@ static int wpa_driver_nl80211_send_mlme(void *priv, const u8 *data,
} }
static int wpa_driver_nl80211_set_beacon(const char *ifname, void *priv, static int wpa_driver_nl80211_set_beacon(void *priv,
const u8 *head, size_t head_len, const u8 *head, size_t head_len,
const u8 *tail, size_t tail_len, const u8 *tail, size_t tail_len,
int dtim_period, int beacon_int) int dtim_period, int beacon_int)
@ -2693,7 +2693,7 @@ static int wpa_driver_nl80211_set_beacon(const char *ifname, void *priv,
u8 cmd = NL80211_CMD_NEW_BEACON; u8 cmd = NL80211_CMD_NEW_BEACON;
int ret; int ret;
int beacon_set; int beacon_set;
int ifindex = if_nametoindex(ifname); int ifindex = if_nametoindex(bss->ifname);
beacon_set = bss->beacon_set; beacon_set = bss->beacon_set;