This patch gets rid of the if_id stuff all over in favour of a new
virtual-interface structure "struct mac80211_vif".
This has two advantages:
* removes the need to look up interfaces by if_id, this is better
for network namespaces and performance
* allows drivers to store and retrieve per-interface data without
having to allocate own lists/hash tables
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
Only compile-tested the driver changes, sanity checks required.
I have this patch now so I'd like to do it now rather than fix the ERP
info stuff first since that'll all change with Ron's BSS configuration
work anyway.
drivers/net/wireless/adm8211.c | 3 -
drivers/net/wireless/ath5k/base.c | 15 +++--
drivers/net/wireless/ath5k/base.h | 2
drivers/net/wireless/ath5k/hw.c | 2
drivers/net/wireless/b43/b43.h | 5 -
drivers/net/wireless/b43/main.c | 13 ++---
drivers/net/wireless/b43/xmit.c | 6 +-
drivers/net/wireless/b43legacy/b43legacy.h | 5 -
drivers/net/wireless/b43legacy/main.c | 13 ++---
drivers/net/wireless/b43legacy/xmit.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-3945.h | 2
drivers/net/wireless/iwlwifi/iwl-4965.h | 2
drivers/net/wireless/iwlwifi/iwl3945-base.c | 28 +++++------
drivers/net/wireless/iwlwifi/iwl4965-base.c | 28 +++++------
drivers/net/wireless/p54common.c | 3 -
drivers/net/wireless/rt2x00/rt2x00.h | 5 +
drivers/net/wireless/rt2x00/rt2x00mac.c | 5 +
drivers/net/wireless/rtl8180.h | 2
drivers/net/wireless/rtl8180_dev.c | 10 ++-
drivers/net/wireless/rtl8187.h | 2
drivers/net/wireless/rtl8187_dev.c | 8 +--
drivers/net/wireless/zd1211rw-mac80211/zd_mac.c | 3 -
include/net/mac80211.h | 61 ++++++++++++++----------
net/mac80211/ieee80211.c | 12 ++--
net/mac80211/ieee80211_i.h | 8 ++-
net/mac80211/ieee80211_sta.c | 2
net/mac80211/sta_info.c | 10 ++-
net/mac80211/tx.c | 50 +++++++++----------
net/mac80211/util.c | 36 +++-----------
29 files changed, 179 insertions(+), 168 deletions(-)
--- everything.orig/include/net/mac80211.h 2007-12-04 14:43:42.786410753 +0100
+++ everything/include/net/mac80211.h 2007-12-04 14:43:48.726410590 +0100
@@ -280,6 +280,7 @@ struct ieee80211_low_level_stats {
* the hardware to use given values (depending on what is supported). */
struct ieee80211_tx_control {
+ struct mac80211_vif *vif;
int tx_rate; /* Transmit rate, given as the hw specific value for the
* rate (from struct ieee80211_rate) */
int rts_cts_rate; /* Transmit rate for RTS/CTS frame, given as the hw
@@ -329,7 +330,6 @@ struct ieee80211_tx_control {
* packet dropping when probing higher rates, if hw
* supports multiple retry rates. -1 = not used */
int type; /* internal */
- int ifindex; /* internal */
};
@@ -524,13 +524,23 @@ enum ieee80211_if_types {
};
/**
+ * struct mac80211_vif - per-interface data
+ *
+ * Data in this structure is continually present for driver
+ * use during the life of a virtual interface.
+ *
+ * @drv_priv: pointer for driver use
+ */
+struct mac80211_vif {
+ void *drv_priv;
+};
+
+/**
* struct ieee80211_if_init_conf - initial configuration of an interface
*
- * @if_id: internal interface ID. This number has no particular meaning to
- * drivers and the only allowed usage is to pass it to
- * ieee80211_beacon_get() and ieee80211_get_buffered_bc() functions.
- * This field is not valid for monitor interfaces
- * (interfaces of %IEEE80211_IF_TYPE_MNTR type).
+ * @vif: pointer to a driver-use per-interface structure. The pointer
+ * itself is also used for various functions including
+ * ieee80211_beacon_get() and ieee80211_get_buffered_bc().
* @type: one of &enum ieee80211_if_types constants. Determines the type of
* added/removed interface.
* @mac_addr: pointer to MAC address of the interface. This pointer is valid
@@ -547,8 +557,8 @@ enum ieee80211_if_types {
* in pure monitor mode.
*/
struct ieee80211_if_init_conf {
- int if_id;
enum ieee80211_if_types type;
+ struct mac80211_vif *vif;
void *mac_addr;
};
@@ -1055,7 +1065,8 @@ struct ieee80211_ops {
struct ieee80211_if_init_conf *conf);
int (*config)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
int (*config_interface)(struct ieee80211_hw *hw,
- int if_id, struct ieee80211_if_conf *conf);
+ struct mac80211_vif *vif,
+ struct ieee80211_if_conf *conf);
void (*configure_filter)(struct ieee80211_hw *hw,
unsigned int changed_flags,
unsigned int *total_flags,
@@ -1074,7 +1085,7 @@ struct ieee80211_ops {
int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value);
int (*set_retry_limit)(struct ieee80211_hw *hw,
u32 short_retry, u32 long_retr);
- void (*sta_notify)(struct ieee80211_hw *hw, int if_id,
+ void (*sta_notify)(struct ieee80211_hw *hw, struct mac80211_vif *vif,
enum sta_notify_cmd, const u8 *addr);
void (*erp_ie_changed)(struct ieee80211_hw *hw, u8 changes,
int cts_protection, int preamble);
@@ -1257,7 +1268,7 @@ void ieee80211_tx_status_irqsafe(struct
/**
* ieee80211_beacon_get - beacon generation function
* @hw: pointer obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @control: will be filled with information needed to send this beacon.
*
* If the beacon frames are generated by the host system (i.e., not in
@@ -1268,13 +1279,13 @@ void ieee80211_tx_status_irqsafe(struct
* is responsible of freeing it.
*/
struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
- int if_id,
+ struct mac80211_vif *vif,
struct ieee80211_tx_control *control);
/**
* ieee80211_rts_get - RTS frame generation function
* @hw: pointer obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @frame: pointer to the frame that is going to be protected by the RTS.
* @frame_len: the frame length (in octets).
* @frame_txctl: &struct ieee80211_tx_control of the frame.
@@ -1285,7 +1296,7 @@ struct sk_buff *ieee80211_beacon_get(str
* the next RTS frame from the 802.11 code. The low-level is responsible
* for calling this function before and RTS frame is needed.
*/
-void ieee80211_rts_get(struct ieee80211_hw *hw, int if_id,
+void ieee80211_rts_get(struct ieee80211_hw *hw, struct mac80211_vif *vif,
const void *frame, size_t frame_len,
const struct ieee80211_tx_control *frame_txctl,
struct ieee80211_rts *rts);
@@ -1293,7 +1304,7 @@ void ieee80211_rts_get(struct ieee80211_
/**
* ieee80211_rts_duration - Get the duration field for an RTS frame
* @hw: pointer obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @frame_len: the length of the frame that is going to be protected by the RTS.
* @frame_txctl: &struct ieee80211_tx_control of the frame.
*
@@ -1301,14 +1312,14 @@ void ieee80211_rts_get(struct ieee80211_
* the duration field, the low-level driver uses this function to receive
* the duration field value in little-endian byteorder.
*/
-__le16 ieee80211_rts_duration(struct ieee80211_hw *hw, int if_id,
+__le16 ieee80211_rts_duration(struct ieee80211_hw *hw, struct mac80211_vif *vif,
size_t frame_len,
const struct ieee80211_tx_control *frame_txctl);
/**
* ieee80211_ctstoself_get - CTS-to-self frame generation function
* @hw: pointer obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @frame: pointer to the frame that is going to be protected by the CTS-to-self.
* @frame_len: the frame length (in octets).
* @frame_txctl: &struct ieee80211_tx_control of the frame.
@@ -1319,7 +1330,7 @@ __le16 ieee80211_rts_duration(struct iee
* the next CTS-to-self frame from the 802.11 code. The low-level is responsible
* for calling this function before and CTS-to-self frame is needed.
*/
-void ieee80211_ctstoself_get(struct ieee80211_hw *hw, int if_id,
+void ieee80211_ctstoself_get(struct ieee80211_hw *hw, struct mac80211_vif *vif,
const void *frame, size_t frame_len,
const struct ieee80211_tx_control *frame_txctl,
struct ieee80211_cts *cts);
@@ -1327,7 +1338,7 @@ void ieee80211_ctstoself_get(struct ieee
/**
* ieee80211_ctstoself_duration - Get the duration field for a CTS-to-self frame
* @hw: pointer obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @frame_len: the length of the frame that is going to be protected by the CTS-to-self.
* @frame_txctl: &struct ieee80211_tx_control of the frame.
*
@@ -1335,28 +1346,30 @@ void ieee80211_ctstoself_get(struct ieee
* the duration field, the low-level driver uses this function to receive
* the duration field value in little-endian byteorder.
*/
-__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, int if_id,
+__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
size_t frame_len,
const struct ieee80211_tx_control *frame_txctl);
/**
* ieee80211_generic_frame_duration - Calculate the duration field for a frame
* @hw: pointer obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @frame_len: the length of the frame.
* @rate: the rate (in 100kbps) at which the frame is going to be transmitted.
*
* Calculate the duration field of some generic frame, given its
* length and transmission rate (in 100kbps).
*/
-__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw, int if_id,
+__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
size_t frame_len,
int rate);
/**
* ieee80211_get_buffered_bc - accessing buffered broadcast and multicast frames
* @hw: pointer as obtained from ieee80211_alloc_hw().
- * @if_id: interface ID from &struct ieee80211_if_init_conf.
+ * @vif: &struct mac80211_vif pointer from &struct ieee80211_if_init_conf.
* @control: will be filled with information needed to send returned frame.
*
* Function for accessing buffered broadcast and multicast frames. If
@@ -1375,7 +1388,7 @@ __le16 ieee80211_generic_frame_duration(
* use common code for all beacons.
*/
struct sk_buff *
-ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,
+ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct mac80211_vif *vif,
struct ieee80211_tx_control *control);
/**
@@ -1465,7 +1478,7 @@ void ieee80211_scan_completed(struct iee
*/
void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
void (*iterator)(void *data, u8 *mac,
- int if_id),
+ struct mac80211_vif *vif),
void *data);
#endif /* MAC80211_H */
--- everything.orig/net/mac80211/ieee80211.c 2007-12-04 14:43:47.516410102 +0100
+++ everything/net/mac80211/ieee80211.c 2007-12-04 14:43:48.736409559 +0100
@@ -259,7 +259,7 @@ static int ieee80211_open(struct net_dev
sdata->u.sta.flags &= ~IEEE80211_STA_PREV_BSSID_SET;
/* fall through */
default:
- conf.if_id = dev->ifindex;
+ conf.vif = &sdata->vif;
conf.type = sdata->type;
conf.mac_addr = dev->dev_addr;
res = local->ops->add_interface(local_to_hw(local), &conf);
@@ -385,7 +385,7 @@ static int ieee80211_stop(struct net_dev
sdata->u.sta.extra_ie_len = 0;
/* fall through */
default:
- conf.if_id = dev->ifindex;
+ conf.vif = &sdata->vif;
conf.type = sdata->type;
conf.mac_addr = dev->dev_addr;
/* disable all keys for as long as this netdev is down */
@@ -521,7 +521,7 @@ static int __ieee80211_if_config(struct
conf.beacon_control = control;
}
return local->ops->config_interface(local_to_hw(local),
- dev->ifindex, &conf);
+ &sdata->vif, &conf);
}
int ieee80211_if_config(struct net_device *dev)
@@ -533,11 +533,13 @@ int ieee80211_if_config_beacon(struct ne
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_tx_control control;
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct sk_buff *skb;
if (!(local->hw.flags & IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE))
return 0;
- skb = ieee80211_beacon_get(local_to_hw(local), dev->ifindex, &control);
+ skb = ieee80211_beacon_get(local_to_hw(local), &sdata->vif,
+ &control);
if (!skb)
return -ENOMEM;
return __ieee80211_if_config(dev, skb, &control);
@@ -742,7 +744,7 @@ static void ieee80211_remove_tx_extra(st
struct ieee80211_tx_packet_data *pkt_data;
pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
- pkt_data->ifindex = control->ifindex;
+ pkt_data->sdata = vif_to_sdata(control->vif);
pkt_data->flags = 0;
if (control->flags & IEEE80211_TXCTL_REQ_TX_STATUS)
pkt_data->flags |= IEEE80211_TXPD_REQ_TX_STATUS;
--- everything.orig/net/mac80211/ieee80211_i.h 2007-12-04 14:43:42.856412055 +0100
+++ everything/net/mac80211/ieee80211_i.h 2007-12-04 14:43:48.736409559 +0100
@@ -166,7 +166,7 @@ struct ieee80211_txrx_data {
#define IEEE80211_TXPD_REQUEUE BIT(2)
/* Stored in sk_buff->cb */
struct ieee80211_tx_packet_data {
- int ifindex;
+ struct ieee80211_sub_if_data *sdata;
unsigned long jiffies;
unsigned int flags;
u8 queue;
@@ -302,6 +302,7 @@ struct ieee80211_sub_if_data {
struct net_device *dev;
struct ieee80211_local *local;
+ struct mac80211_vif vif;
unsigned int flags;
@@ -392,6 +393,11 @@ struct ieee80211_sub_if_data {
#endif
};
+static inline struct ieee80211_sub_if_data *vif_to_sdata(struct mac80211_vif *p)
+{
+ return container_of(p, struct ieee80211_sub_if_data, vif);
+}
+
#define IEEE80211_DEV_TO_SUB_IF(dev) netdev_priv(dev)
enum {
--- everything.orig/net/mac80211/util.c 2007-12-04 14:43:42.886412381 +0100
+++ everything/net/mac80211/util.c 2007-12-04 14:43:48.736409559 +0100
@@ -301,44 +301,34 @@ int ieee80211_frame_duration(struct ieee
}
/* Exported duration function for driver use */
-__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw, int if_id,
+__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
size_t frame_len, int rate)
{
struct ieee80211_local *local = hw_to_local(hw);
- struct net_device *bdev = dev_get_by_index(&init_net, if_id);
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
u16 dur;
int erp;
- if (unlikely(!bdev))
- return 0;
-
- sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
erp = ieee80211_is_erp_rate(hw->conf.phymode, rate);
dur = ieee80211_frame_duration(local, frame_len, rate,
erp, sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE);
- dev_put(bdev);
return cpu_to_le16(dur);
}
EXPORT_SYMBOL(ieee80211_generic_frame_duration);
-__le16 ieee80211_rts_duration(struct ieee80211_hw *hw, int if_id,
+__le16 ieee80211_rts_duration(struct ieee80211_hw *hw, struct mac80211_vif *vif,
size_t frame_len,
const struct ieee80211_tx_control *frame_txctl)
{
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_rate *rate;
- struct net_device *bdev = dev_get_by_index(&init_net, if_id);
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
int short_preamble;
int erp;
u16 dur;
- if (unlikely(!bdev))
- return 0;
-
- sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
short_preamble = sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE;
rate = frame_txctl->rts_rate;
@@ -354,27 +344,22 @@ __le16 ieee80211_rts_duration(struct iee
dur += ieee80211_frame_duration(local, 10, rate->rate,
erp, short_preamble);
- dev_put(bdev);
return cpu_to_le16(dur);
}
EXPORT_SYMBOL(ieee80211_rts_duration);
-__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, int if_id,
+__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
size_t frame_len,
const struct ieee80211_tx_control *frame_txctl)
{
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_rate *rate;
- struct net_device *bdev = dev_get_by_index(&init_net, if_id);
- struct ieee80211_sub_if_data *sdata;
+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
int short_preamble;
int erp;
u16 dur;
- if (unlikely(!bdev))
- return 0;
-
- sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
short_preamble = sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE;
rate = frame_txctl->rts_rate;
@@ -389,7 +374,6 @@ __le16 ieee80211_ctstoself_duration(stru
erp, short_preamble);
}
- dev_put(bdev);
return cpu_to_le16(dur);
}
EXPORT_SYMBOL(ieee80211_ctstoself_duration);
@@ -476,7 +460,7 @@ EXPORT_SYMBOL(ieee80211_wake_queues);
void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
void (*iterator)(void *data, u8 *mac,
- int if_id),
+ struct mac80211_vif *p),
void *data)
{
struct ieee80211_local *local = hw_to_local(hw);
@@ -500,7 +484,7 @@ void ieee80211_iterate_active_interfaces
continue;
if (netif_running(sdata->dev))
iterator(data, sdata->dev->dev_addr,
- sdata->dev->ifindex);
+ &sdata->vif);
}
rcu_read_unlock();
--- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-04 14:43:42.926411567 +0100
+++ everything/net/mac80211/ieee80211_sta.c 2007-12-04 14:43:48.736409559 +0100
@@ -517,7 +517,7 @@ static void ieee80211_sta_tx(struct net_
pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
- pkt_data->ifindex = sdata->dev->ifindex;
+ pkt_data->sdata = sdata;
if (!encrypt)
pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
--- everything.orig/net/mac80211/tx.c 2007-12-04 14:43:42.956409614 +0100
+++ everything/net/mac80211/tx.c 2007-12-04 14:43:48.746412110 +0100
@@ -1011,7 +1011,7 @@ static int ieee80211_tx_prepare(struct i
struct net_device *dev;
pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
- dev = dev_get_by_index(&init_net, pkt_data->ifindex);
+ dev = pkt_data->sdata->dev;
if (unlikely(dev && !is_ieee80211_device(dev, mdev))) {
dev_put(dev);
dev = NULL;
@@ -1225,8 +1225,9 @@ int ieee80211_master_start_xmit(struct s
pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
memset(&control, 0, sizeof(struct ieee80211_tx_control));
- if (pkt_data->ifindex)
- odev = dev_get_by_index(&init_net, pkt_data->ifindex);
+ if (pkt_data->sdata)
+ odev = pkt_data->sdata->dev;
+
if (unlikely(odev && !is_ieee80211_device(odev, dev))) {
dev_put(odev);
odev = NULL;
@@ -1250,7 +1251,7 @@ int ieee80211_master_start_xmit(struct s
}
}
- control.ifindex = odev->ifindex;
+ control.vif = &osdata->vif;
control.type = osdata->type;
if (pkt_data->flags & IEEE80211_TXPD_REQ_TX_STATUS)
control.flags |= IEEE80211_TXCTL_REQ_TX_STATUS;
@@ -1295,7 +1296,7 @@ int ieee80211_monitor_start_xmit(struct
pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
memset(pkt_data, 0, sizeof(*pkt_data));
/* needed because we set skb device to master */
- pkt_data->ifindex = dev->ifindex;
+ pkt_data->sdata = IEEE80211_DEV_TO_SUB_IF(dev);
pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
@@ -1504,7 +1505,7 @@ int ieee80211_subif_start_xmit(struct sk
pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
- pkt_data->ifindex = dev->ifindex;
+ pkt_data->sdata = IEEE80211_DEV_TO_SUB_IF(dev);
skb->dev = local->mdev;
dev->stats.tx_packets++;
@@ -1659,7 +1660,8 @@ static void ieee80211_beacon_add_tim(str
read_unlock_bh(&local->sta_lock);
}
-struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, int if_id,
+struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_tx_control *control)
{
struct ieee80211_local *local = hw_to_local(hw);
@@ -1672,19 +1674,15 @@ struct sk_buff *ieee80211_beacon_get(str
u8 *b_head, *b_tail;
int bh_len, bt_len;
- bdev = dev_get_by_index(&init_net, if_id);
- if (bdev) {
- sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
- ap = &sdata->u.ap;
- dev_put(bdev);
- }
+ sdata = vif_to_sdata(vif);
+ bdev = sdata->dev;
if (!ap || sdata->type != IEEE80211_IF_TYPE_AP ||
!ap->beacon_head) {
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
if (net_ratelimit())
- printk(KERN_DEBUG "no beacon data avail for idx=%d "
- "(%s)\n", if_id, bdev ? bdev->name : "N/A");
+ printk(KERN_DEBUG "no beacon data avail for %s\n",
+ bdev->name);
#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
return NULL;
}
@@ -1741,7 +1739,7 @@ struct sk_buff *ieee80211_beacon_get(str
}
EXPORT_SYMBOL(ieee80211_beacon_get);
-void ieee80211_rts_get(struct ieee80211_hw *hw, int if_id,
+void ieee80211_rts_get(struct ieee80211_hw *hw, struct mac80211_vif *vif,
const void *frame, size_t frame_len,
const struct ieee80211_tx_control *frame_txctl,
struct ieee80211_rts *rts)
@@ -1751,13 +1749,14 @@ void ieee80211_rts_get(struct ieee80211_
fctl = IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS;
rts->frame_control = cpu_to_le16(fctl);
- rts->duration = ieee80211_rts_duration(hw, if_id, frame_len, frame_txctl);
+ rts->duration = ieee80211_rts_duration(hw, vif, frame_len,
+ frame_txctl);
memcpy(rts->ra, hdr->addr1, sizeof(rts->ra));
memcpy(rts->ta, hdr->addr2, sizeof(rts->ta));
}
EXPORT_SYMBOL(ieee80211_rts_get);
-void ieee80211_ctstoself_get(struct ieee80211_hw *hw, int if_id,
+void ieee80211_ctstoself_get(struct ieee80211_hw *hw, struct mac80211_vif *vif,
const void *frame, size_t frame_len,
const struct ieee80211_tx_control *frame_txctl,
struct ieee80211_cts *cts)
@@ -1767,13 +1766,15 @@ void ieee80211_ctstoself_get(struct ieee
fctl = IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS;
cts->frame_control = cpu_to_le16(fctl);
- cts->duration = ieee80211_ctstoself_duration(hw, if_id, frame_len, frame_txctl);
+ cts->duration = ieee80211_ctstoself_duration(hw, vif,
+ frame_len, frame_txctl);
memcpy(cts->ra, hdr->addr1, sizeof(cts->ra));
}
EXPORT_SYMBOL(ieee80211_ctstoself_get);
struct sk_buff *
-ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,
+ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_tx_control *control)
{
struct ieee80211_local *local = hw_to_local(hw);
@@ -1786,12 +1787,9 @@ ieee80211_get_buffered_bc(struct ieee802
struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_ap *bss = NULL;
- bdev = dev_get_by_index(&init_net, if_id);
- if (bdev) {
- sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
- bss = &sdata->u.ap;
- dev_put(bdev);
- }
+ sdata = vif_to_sdata(vif);
+ bdev = sdata->dev;
+
if (!bss || sdata->type != IEEE80211_IF_TYPE_AP || !bss->beacon_head)
return NULL;
--- everything.orig/drivers/net/wireless/b43/b43.h 2007-12-04 14:43:43.036409559 +0100
+++ everything/drivers/net/wireless/b43/b43.h 2007-12-04 14:43:48.746412110 +0100
@@ -609,10 +609,7 @@ struct b43_wl {
* at a time. General information about this interface follows.
*/
- /* Opaque ID of the operating interface from the ieee80211
- * subsystem. Do not modify.
- */
- int if_id;
+ struct mac80211_vif *vif;
/* The MAC address of the operating interface. */
u8 mac_addr[ETH_ALEN];
/* Current BSSID */
--- everything.orig/drivers/net/wireless/b43/main.c 2007-12-04 14:43:43.116411241 +0100
+++ everything/drivers/net/wireless/b43/main.c 2007-12-04 14:43:48.756410807 +0100
@@ -1179,7 +1179,7 @@ static void b43_write_probe_resp_plcp(st
plcp.data = 0;
b43_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
dur = ieee80211_generic_frame_duration(dev->wl->hw,
- dev->wl->if_id, size,
+ dev->wl->vif, size,
B43_RATE_TO_BASE100KBPS(rate));
/* Write PLCP in two parts and timing for packet transfer */
tmp = le32_to_cpu(plcp.data);
@@ -1236,7 +1236,7 @@ static u8 *b43_generate_probe_resp(struc
hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_PROBE_RESP);
dur = ieee80211_generic_frame_duration(dev->wl->hw,
- dev->wl->if_id, *dest_size,
+ dev->wl->vif, *dest_size,
B43_RATE_TO_BASE100KBPS(rate));
hdr->duration_id = dur;
@@ -2940,7 +2940,7 @@ static void b43_op_configure_filter(stru
}
static int b43_op_config_interface(struct ieee80211_hw *hw,
- int if_id,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct b43_wl *wl = hw_to_b43_wl(hw);
@@ -2951,7 +2951,7 @@ static int b43_op_config_interface(struc
return -ENODEV;
mutex_lock(&wl->mutex);
spin_lock_irqsave(&wl->irq_lock, flags);
- B43_WARN_ON(wl->if_id != if_id);
+ B43_WARN_ON(wl->vif != vif);
if (conf->bssid)
memcpy(wl->bssid, conf->bssid, ETH_ALEN);
else
@@ -3454,7 +3454,7 @@ static int b43_op_add_interface(struct i
dev = wl->current_dev;
wl->operating = 1;
- wl->if_id = conf->if_id;
+ wl->vif = conf->vif;
wl->if_type = conf->type;
memcpy(wl->mac_addr, conf->mac_addr, ETH_ALEN);
@@ -3482,7 +3482,8 @@ static void b43_op_remove_interface(stru
mutex_lock(&wl->mutex);
B43_WARN_ON(!wl->operating);
- B43_WARN_ON(wl->if_id != conf->if_id);
+ B43_WARN_ON(wl->vif != conf->vif);
+ wl->vif = NULL;
wl->operating = 0;
--- everything.orig/drivers/net/wireless/b43/xmit.c 2007-12-04 14:43:43.156410102 +0100
+++ everything/drivers/net/wireless/b43/xmit.c 2007-12-04 14:43:48.756410807 +0100
@@ -221,7 +221,7 @@ static void generate_txhdr_fw4(struct b4
} else {
int fbrate_base100kbps = B43_RATE_TO_BASE100KBPS(rate_fb);
txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
- dev->wl->if_id,
+ txctl->vif,
fragment_len,
fbrate_base100kbps);
}
@@ -311,7 +311,7 @@ static void generate_txhdr_fw4(struct b4
rts_rate_fb_ofdm = b43_is_ofdm_rate(rts_rate_fb);
if (txctl->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
- ieee80211_ctstoself_get(dev->wl->hw, dev->wl->if_id,
+ ieee80211_ctstoself_get(dev->wl->hw, txctl->vif,
fragment_data, fragment_len,
txctl,
(struct ieee80211_cts *)(txhdr->
@@ -319,7 +319,7 @@ static void generate_txhdr_fw4(struct b4
mac_ctl |= B43_TX4_MAC_SENDCTS;
len = sizeof(struct ieee80211_cts);
} else {
- ieee80211_rts_get(dev->wl->hw, dev->wl->if_id,
+ ieee80211_rts_get(dev->wl->hw, txctl->vif,
fragment_data, fragment_len, txctl,
(struct ieee80211_rts *)(txhdr->
rts_frame));
--- everything.orig/drivers/net/wireless/b43legacy/b43legacy.h 2007-12-04 14:43:43.196410048 +0100
+++ everything/drivers/net/wireless/b43legacy/b43legacy.h 2007-12-04 14:43:48.756410807 +0100
@@ -572,10 +572,7 @@ struct b43legacy_wl {
* at a time. General information about this interface follows.
*/
- /* Opaque ID of the operating interface from the ieee80211
- * subsystem. Do not modify.
- */
- int if_id;
+ struct mac80211_vif *vif;
/* MAC address (can be NULL). */
u8 mac_addr[ETH_ALEN];
/* Current BSSID (can be NULL). */
--- everything.orig/drivers/net/wireless/b43legacy/main.c 2007-12-04 14:43:43.236410807 +0100
+++ everything/drivers/net/wireless/b43legacy/main.c 2007-12-04 14:43:48.766411947 +0100
@@ -976,7 +976,7 @@ static void b43legacy_write_probe_resp_p
plcp.data = 0;
b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
dur = ieee80211_generic_frame_duration(dev->wl->hw,
- dev->wl->if_id,
+ dev->wl->vif,
size,
B43legacy_RATE_TO_100KBPS(rate));
/* Write PLCP in two parts and timing for packet transfer */
@@ -1042,7 +1042,7 @@ static u8 *b43legacy_generate_probe_resp
hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_PROBE_RESP);
dur = ieee80211_generic_frame_duration(dev->wl->hw,
- dev->wl->if_id,
+ dev->wl->vif,
*dest_size,
B43legacy_RATE_TO_100KBPS(rate));
hdr->duration_id = dur;
@@ -2635,7 +2635,7 @@ static void b43legacy_op_configure_filte
}
static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
- int if_id,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
@@ -2646,7 +2646,7 @@ static int b43legacy_op_config_interface
return -ENODEV;
mutex_lock(&wl->mutex);
spin_lock_irqsave(&wl->irq_lock, flags);
- B43legacy_WARN_ON(wl->if_id != if_id);
+ B43legacy_WARN_ON(wl->vif != vif);
if (conf->bssid)
memcpy(wl->bssid, conf->bssid, ETH_ALEN);
else
@@ -3168,7 +3168,7 @@ static int b43legacy_op_add_interface(st
dev = wl->current_dev;
wl->operating = 1;
- wl->if_id = conf->if_id;
+ wl->vif = conf->vif;
wl->if_type = conf->type;
memcpy(wl->mac_addr, conf->mac_addr, ETH_ALEN);
@@ -3196,7 +3196,8 @@ static void b43legacy_op_remove_interfac
mutex_lock(&wl->mutex);
B43legacy_WARN_ON(!wl->operating);
- B43legacy_WARN_ON(wl->if_id != conf->if_id);
+ B43legacy_WARN_ON(wl->vif != conf->vif);
+ wl->vif = NULL;
wl->operating = 0;
--- everything.orig/drivers/net/wireless/b43legacy/xmit.c 2007-12-04 14:43:43.276409072 +0100
+++ everything/drivers/net/wireless/b43legacy/xmit.c 2007-12-04 14:43:48.766411947 +0100
@@ -223,7 +223,7 @@ static void generate_txhdr_fw3(struct b4
} else {
int fbrate_base100kbps = B43legacy_RATE_TO_100KBPS(rate_fb);
txhdr->dur_fb = ieee80211_generic_frame_duration(dev->wl->hw,
- dev->wl->if_id,
+ txctl->vif,
fragment_len,
fbrate_base100kbps);
}
@@ -312,7 +312,7 @@ static void generate_txhdr_fw3(struct b4
if (txctl->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
ieee80211_ctstoself_get(dev->wl->hw,
- dev->wl->if_id,
+ txctl->vif,
fragment_data,
fragment_len, txctl,
(struct ieee80211_cts *)
@@ -321,7 +321,7 @@ static void generate_txhdr_fw3(struct b4
len = sizeof(struct ieee80211_cts);
} else {
ieee80211_rts_get(dev->wl->hw,
- dev->wl->if_id,
+ txctl->vif,
fragment_data, fragment_len, txctl,
(struct ieee80211_rts *)
(txhdr->rts_frame));
--- everything.orig/drivers/net/wireless/ath5k/base.c 2007-12-04 14:43:43.356410102 +0100
+++ everything/drivers/net/wireless/ath5k/base.c 2007-12-04 14:43:48.766411947 +0100
@@ -273,7 +273,8 @@ static void ath5k_remove_interface(struc
struct ieee80211_if_init_conf *conf);
static int ath5k_config(struct ieee80211_hw *hw,
struct ieee80211_conf *conf);
-static int ath5k_config_interface(struct ieee80211_hw *hw, int if_id,
+static int ath5k_config_interface(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf);
static void ath5k_configure_filter(struct ieee80211_hw *hw,
unsigned int changed_flags,
@@ -2618,12 +2619,12 @@ static int ath5k_add_interface(struct ie
int ret;
mutex_lock(&sc->lock);
- if (sc->iface_id) {
+ if (sc->vif) {
ret = 0;
goto end;
}
- sc->iface_id = conf->if_id;
+ sc->vif = conf->vif;
switch (conf->type) {
case IEEE80211_IF_TYPE_STA:
@@ -2648,10 +2649,10 @@ ath5k_remove_interface(struct ieee80211_
struct ath5k_softc *sc = hw->priv;
mutex_lock(&sc->lock);
- if (sc->iface_id != conf->if_id)
+ if (sc->vif != conf->vif)
goto end;
- sc->iface_id = 0;
+ sc->vif = NULL;
end:
mutex_unlock(&sc->lock);
}
@@ -2669,7 +2670,7 @@ ath5k_config(struct ieee80211_hw *hw,
}
static int
-ath5k_config_interface(struct ieee80211_hw *hw, int if_id,
+ath5k_config_interface(struct ieee80211_hw *hw, struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct ath5k_softc *sc = hw->priv;
@@ -2680,7 +2681,7 @@ ath5k_config_interface(struct ieee80211_
* be set to mac80211's value at ath5k_config(). */
sc->bintval = 1000 * 1000 / 1024;
mutex_lock(&sc->lock);
- if (sc->iface_id != if_id) {
+ if (sc->vif != vif) {
ret = -EIO;
goto unlock;
}
--- everything.orig/drivers/net/wireless/ath5k/base.h 2007-12-04 14:43:43.376409505 +0100
+++ everything/drivers/net/wireless/ath5k/base.h 2007-12-04 14:43:48.766411947 +0100
@@ -120,7 +120,7 @@ struct ath5k_softc {
unsigned int curmode; /* current phy mode */
struct ieee80211_channel *curchan; /* current h/w channel */
- int iface_id; /* add/remove_interface id */
+ struct mac80211_vif *vif;
struct {
u8 rxflags; /* radiotap rx flags */
--- everything.orig/drivers/net/wireless/ath5k/hw.c 2007-12-04 14:43:43.456411297 +0100
+++ everything/drivers/net/wireless/ath5k/hw.c 2007-12-04 14:43:48.776410265 +0100
@@ -556,7 +556,7 @@ static inline void ath5k_hw_write_rate_d
* ieee80211_duration() for a brief description of
* what rate we should choose to TX ACKs. */
tx_time = ieee80211_generic_frame_duration(sc->hw,
- sc->iface_id, 10, control_rate->rate_kbps/100);
+ sc->vif, 10, control_rate->rate_kbps/100);
ath5k_hw_reg_write(ah, tx_time, reg);
--- everything.orig/drivers/net/wireless/iwlwifi/iwl-3945.h 2007-12-04 14:43:43.486409234 +0100
+++ everything/drivers/net/wireless/iwlwifi/iwl-3945.h 2007-12-04 14:43:48.776410265 +0100
@@ -898,7 +898,7 @@ struct iwl3945_priv {
u32 timestamp1;
u16 beacon_int;
struct iwl3945_driver_hw_info hw_setting;
- int interface_id;
+ struct mac80211_vif *vif;
/* Current association information needed to configure the
* hardware */
--- everything.orig/drivers/net/wireless/iwlwifi/iwl-4965.h 2007-12-04 14:43:43.526410428 +0100
+++ everything/drivers/net/wireless/iwlwifi/iwl-4965.h 2007-12-04 14:43:48.776410265 +0100
@@ -1240,7 +1240,7 @@ struct iwl4965_priv {
u32 timestamp1;
u16 beacon_int;
struct iwl4965_driver_hw_info hw_setting;
- int interface_id;
+ struct mac80211_vif *vif;
/* Current association information needed to configure the
* hardware */
--- everything.orig/drivers/net/wireless/rtl8187.h 2007-12-04 14:43:43.636410049 +0100
+++ everything/drivers/net/wireless/rtl8187.h 2007-12-04 14:43:48.786413900 +0100
@@ -65,8 +65,8 @@ struct rtl8187_priv {
/* common between rtl818x drivers */
struct rtl818x_csr *map;
void (*rf_init)(struct ieee80211_hw *);
+ struct mac80211_vif *vif;
int mode;
- int if_id;
/* rtl8187 specific */
struct ieee80211_channel channels[14];
--- everything.orig/drivers/net/wireless/rtl8187_dev.c 2007-12-04 14:43:43.686410916 +0100
+++ everything/drivers/net/wireless/rtl8187_dev.c 2007-12-04 14:43:48.786413900 +0100
@@ -148,7 +148,8 @@ static int rtl8187_tx(struct ieee80211_h
flags |= RTL8187_TX_FLAG_MORE_FRAG;
if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
flags |= RTL8187_TX_FLAG_RTS;
- rts_dur = ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
+ rts_dur = ieee80211_rts_duration(dev, priv->vif,
+ skb->len, control);
}
if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
flags |= RTL8187_TX_FLAG_CTS;
@@ -563,14 +564,13 @@ static int rtl8187_config(struct ieee802
return 0;
}
-static int rtl8187_config_interface(struct ieee80211_hw *dev, int if_id,
+static int rtl8187_config_interface(struct ieee80211_hw *dev,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct rtl8187_priv *priv = dev->priv;
int i;
- priv->if_id = if_id;
-
for (i = 0; i < ETH_ALEN; i++)
rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
--- everything.orig/drivers/net/wireless/adm8211.c 2007-12-04 14:43:43.716416450 +0100
+++ everything/drivers/net/wireless/adm8211.c 2007-12-04 14:43:48.786413900 +0100
@@ -1312,7 +1312,8 @@ static int adm8211_config(struct ieee802
return 0;
}
-static int adm8211_config_interface(struct ieee80211_hw *dev, int if_id,
+static int adm8211_config_interface(struct ieee80211_hw *dev,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct adm8211_priv *priv = dev->priv;
--- everything.orig/drivers/net/wireless/p54common.c 2007-12-04 14:43:43.786413194 +0100
+++ everything/drivers/net/wireless/p54common.c 2007-12-04 14:43:48.786413900 +0100
@@ -853,7 +853,8 @@ static int p54_config(struct ieee80211_h
return ret;
}
-static int p54_config_interface(struct ieee80211_hw *dev, int if_id,
+static int p54_config_interface(struct ieee80211_hw *dev,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct p54_common *priv = dev->priv;
--- everything.orig/drivers/net/wireless/rtl8180_dev.c 2007-12-04 14:43:43.816409181 +0100
+++ everything/drivers/net/wireless/rtl8180_dev.c 2007-12-04 14:43:48.796409939 +0100
@@ -226,7 +226,7 @@ static int rtl8180_tx(struct ieee80211_h
/* TODO: calculate PLCP length - needed for rtl8180 */
if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS)
entry->rts_duration =
- ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
+ ieee80211_rts_duration(dev, priv->vif, skb->len, control);
entry->tx_buf = cpu_to_le32(mapping);
entry->frame_len = cpu_to_le32(skb->len);
entry->flags2 = control->alt_retry_rate != -1 ?
@@ -595,6 +595,8 @@ static int rtl8180_add_interface(struct
return -EOPNOTSUPP;
}
+ priv->vif = conf->vif;
+
rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
rtl818x_iowrite32(priv, (__le32 __iomem *)&priv->map->MAC[0],
cpu_to_le32(*(u32 *)conf->mac_addr));
@@ -610,6 +612,7 @@ static void rtl8180_remove_interface(str
{
struct rtl8180_priv *priv = dev->priv;
priv->mode = IEEE80211_IF_TYPE_MNTR;
+ priv->vif = NULL;
}
static int rtl8180_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
@@ -621,14 +624,13 @@ static int rtl8180_config(struct ieee802
return 0;
}
-static int rtl8180_config_interface(struct ieee80211_hw *dev, int if_id,
+static int rtl8180_config_interface(struct ieee80211_hw *dev,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct rtl8180_priv *priv = dev->priv;
int i;
- priv->if_id = if_id;
-
for (i = 0; i < ETH_ALEN; i++)
rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
--- everything.orig/drivers/net/wireless/rtl8180.h 2007-12-04 14:43:43.866412706 +0100
+++ everything/drivers/net/wireless/rtl8180.h 2007-12-04 14:43:48.796409939 +0100
@@ -78,8 +78,8 @@ struct rtl8180_priv {
void (*rf_init)(struct ieee80211_hw *);
void (*rf_stop)(struct ieee80211_hw *);
void (*rf_set_chan)(struct ieee80211_hw *, struct ieee80211_conf *);
+ struct mac80211_vif *vif;
int mode;
- int if_id;
/* rtl8180 driver specific */
spinlock_t lock;
--- everything.orig/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-12-04 14:43:43.556409776 +0100
+++ everything/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-12-04 14:43:48.806410157 +0100
@@ -2732,8 +2732,8 @@ static int iwl3945_tx_skb(struct iwl3945
goto drop_unlock;
}
- if (!priv->interface_id) {
- IWL_DEBUG_DROP("Dropping - !priv->interface_id\n");
+ if (!priv->vif) {
+ IWL_DEBUG_DROP("Dropping - !priv->vif\n");
goto drop_unlock;
}
@@ -3565,7 +3565,7 @@ static void iwl3945_bg_beacon_update(str
struct sk_buff *beacon;
/* Pull updated AP beacon from mac80211. will fail if not in AP mode */
- beacon = ieee80211_beacon_get(priv->hw, priv->interface_id, NULL);
+ beacon = ieee80211_beacon_get(priv->hw, priv->vif, NULL);
if (!beacon) {
IWL_ERROR("update beacon failed\n");
@@ -6732,7 +6732,7 @@ static void iwl3945_bg_post_associate(st
mutex_lock(&priv->mutex);
- if (!priv->interface_id || !priv->is_open) {
+ if (!priv->vif || !priv->is_open) {
mutex_unlock(&priv->mutex);
return;
}
@@ -6925,15 +6925,15 @@ static int iwl3945_mac_add_interface(str
unsigned long flags;
DECLARE_MAC_BUF(mac);
- IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
+ IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
- if (priv->interface_id) {
- IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
+ if (priv->vif) {
+ IWL_DEBUG_MAC80211("leave - vif != NULL\n");
return -EOPNOTSUPP;
}
spin_lock_irqsave(&priv->lock, flags);
- priv->interface_id = conf->if_id;
+ priv->vif = conf->vif;
spin_unlock_irqrestore(&priv->lock, flags);
@@ -7117,7 +7117,8 @@ static void iwl3945_config_ap(struct iwl
* clear sta table, add BCAST sta... */
}
-static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, int if_id,
+static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct iwl3945_priv *priv = hw->priv;
@@ -7139,7 +7140,6 @@ static int iwl3945_mac_config_interface(
mutex_lock(&priv->mutex);
- IWL_DEBUG_MAC80211("enter: interface id %d\n", if_id);
if (conf->bssid)
IWL_DEBUG_MAC80211("bssid: %s\n",
print_mac(mac, conf->bssid));
@@ -7156,8 +7156,8 @@ static int iwl3945_mac_config_interface(
return 0;
}
- if (priv->interface_id != if_id) {
- IWL_DEBUG_MAC80211("leave - interface_id != if_id\n");
+ if (priv->vif != vif) {
+ IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");
mutex_unlock(&priv->mutex);
return 0;
}
@@ -7250,8 +7250,8 @@ static void iwl3945_mac_remove_interface
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwl3945_commit_rxon(priv);
- if (priv->interface_id == conf->if_id) {
- priv->interface_id = 0;
+ if (priv->vif == conf->vif) {
+ priv->vif = NULL;
memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
--- everything.orig/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-12-04 14:43:43.606412272 +0100
+++ everything/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-12-04 14:43:48.816409722 +0100
@@ -2837,8 +2837,8 @@ static int iwl4965_tx_skb(struct iwl4965
goto drop_unlock;
}
- if (!priv->interface_id) {
- IWL_DEBUG_DROP("Dropping - !priv->interface_id\n");
+ if (!priv->vif) {
+ IWL_DEBUG_DROP("Dropping - !priv->vif\n");
goto drop_unlock;
}
@@ -3875,7 +3875,7 @@ static void iwl4965_bg_beacon_update(str
struct sk_buff *beacon;
/* Pull updated AP beacon from mac80211. will fail if not in AP mode */
- beacon = ieee80211_beacon_get(priv->hw, priv->interface_id, NULL);
+ beacon = ieee80211_beacon_get(priv->hw, priv->vif, NULL);
if (!beacon) {
IWL_ERROR("update beacon failed\n");
@@ -7128,7 +7128,7 @@ static void iwl4965_bg_post_associate(st
mutex_lock(&priv->mutex);
- if (!priv->interface_id || !priv->is_open) {
+ if (!priv->vif || !priv->is_open) {
mutex_unlock(&priv->mutex);
return;
}
@@ -7331,15 +7331,15 @@ static int iwl4965_mac_add_interface(str
unsigned long flags;
DECLARE_MAC_BUF(mac);
- IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
+ IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
- if (priv->interface_id) {
- IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
+ if (priv->vif) {
+ IWL_DEBUG_MAC80211("leave - vif != NULL\n");
return 0;
}
spin_lock_irqsave(&priv->lock, flags);
- priv->interface_id = conf->if_id;
+ priv->vif = conf->vif;
spin_unlock_irqrestore(&priv->lock, flags);
@@ -7539,7 +7539,8 @@ static void iwl4965_config_ap(struct iwl
* clear sta table, add BCAST sta... */
}
-static int iwl4965_mac_config_interface(struct ieee80211_hw *hw, int if_id,
+static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct iwl4965_priv *priv = hw->priv;
@@ -7559,7 +7560,6 @@ static int iwl4965_mac_config_interface(
mutex_lock(&priv->mutex);
- IWL_DEBUG_MAC80211("enter: interface id %d\n", if_id);
if (conf->bssid)
IWL_DEBUG_MAC80211("bssid: %s\n",
print_mac(mac, conf->bssid));
@@ -7576,8 +7576,8 @@ static int iwl4965_mac_config_interface(
return 0;
}
- if (priv->interface_id != if_id) {
- IWL_DEBUG_MAC80211("leave - interface_id != if_id\n");
+ if (priv->vif != vif) {
+ IWL_DEBUG_MAC80211("leave - priv->vif != vif\n");
mutex_unlock(&priv->mutex);
return 0;
}
@@ -7670,8 +7670,8 @@ static void iwl4965_mac_remove_interface
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwl4965_commit_rxon(priv);
- if (priv->interface_id == conf->if_id) {
- priv->interface_id = 0;
+ if (priv->vif == conf->vif) {
+ priv->vif = NULL;
memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
--- everything.orig/drivers/net/wireless/rt2x00/rt2x00.h 2007-12-04 14:43:43.896410210 +0100
+++ everything/drivers/net/wireless/rt2x00/rt2x00.h 2007-12-04 14:43:48.816409722 +0100
@@ -366,7 +366,7 @@ struct interface {
* to us by the 80211 stack, and is used to request
* new beacons.
*/
- int id;
+ struct mac80211_vif *id;
/*
* Current working type (IEEE80211_IF_TYPE_*).
@@ -919,7 +919,8 @@ int rt2x00mac_add_interface(struct ieee8
void rt2x00mac_remove_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf);
int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
-int rt2x00mac_config_interface(struct ieee80211_hw *hw, int if_id,
+int rt2x00mac_config_interface(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf);
int rt2x00mac_get_stats(struct ieee80211_hw *hw,
struct ieee80211_low_level_stats *stats);
--- everything.orig/drivers/net/wireless/rt2x00/rt2x00mac.c 2007-12-04 14:43:43.946410971 +0100
+++ everything/drivers/net/wireless/rt2x00/rt2x00mac.c 2007-12-04 14:43:48.826410916 +0100
@@ -213,7 +213,7 @@ int rt2x00mac_add_interface(struct ieee8
is_interface_present(intf))
return -ENOBUFS;
- intf->id = conf->if_id;
+ intf->id = conf->vif;
intf->type = conf->type;
if (conf->type == IEEE80211_IF_TYPE_AP)
memcpy(&intf->bssid, conf->mac_addr, ETH_ALEN);
@@ -297,7 +297,8 @@ int rt2x00mac_config(struct ieee80211_hw
}
EXPORT_SYMBOL_GPL(rt2x00mac_config);
-int rt2x00mac_config_interface(struct ieee80211_hw *hw, int if_id,
+int rt2x00mac_config_interface(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct rt2x00_dev *rt2x00dev = hw->priv;
--- everything.orig/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c 2007-12-04 14:43:44.006413032 +0100
+++ everything/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c 2007-12-04 14:43:48.846410970 +0100
@@ -725,7 +725,8 @@ static int zd_op_config(struct ieee80211
return zd_chip_set_channel(&mac->chip, conf->channel);
}
-static int zd_op_config_interface(struct ieee80211_hw *hw, int if_id,
+static int zd_op_config_interface(struct ieee80211_hw *hw,
+ struct mac80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct zd_mac *mac = zd_hw_mac(hw);
--- everything.orig/net/mac80211/sta_info.c 2007-12-04 14:43:43.016410048 +0100
+++ everything/net/mac80211/sta_info.c 2007-12-04 14:45:15.586407227 +0100
@@ -132,6 +132,7 @@ struct sta_info * sta_info_add(struct ie
struct net_device *dev, u8 *addr, gfp_t gfp)
{
struct sta_info *sta;
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
DECLARE_MAC_BUF(mac);
sta = kzalloc(sizeof(*sta), gfp);
@@ -160,7 +161,7 @@ struct sta_info * sta_info_add(struct ie
local->num_sta++;
sta_info_hash_add(local, sta);
if (local->ops->sta_notify)
- local->ops->sta_notify(local_to_hw(local), dev->ifindex,
+ local->ops->sta_notify(local_to_hw(local), &sdata->vif,
STA_NOTIFY_ADD, addr);
write_unlock_bh(&local->sta_lock);
@@ -205,6 +206,7 @@ void sta_info_free(struct sta_info *sta)
{
struct sk_buff *skb;
struct ieee80211_local *local = sta->local;
+ struct ieee80211_sub_if_data *sdata;
DECLARE_MAC_BUF(mac);
might_sleep();
@@ -229,9 +231,11 @@ void sta_info_free(struct sta_info *sta)
ieee80211_key_free(sta->key);
sta->key = NULL;
- if (local->ops->sta_notify)
- local->ops->sta_notify(local_to_hw(local), sta->dev->ifindex,
+ if (local->ops->sta_notify) {
+ sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
+ local->ops->sta_notify(local_to_hw(local), &sdata->vif,
STA_NOTIFY_REMOVE, sta->addr);
+ }
rate_control_remove_sta_debugfs(sta);
ieee80211_sta_debugfs_remove(sta);
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
