rt2x00: provide beacon's txdesc to write_beacon callback function.
Preparation to fix rt2800 beaconing. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
d61cb26696
commit
f224f4ef79
|
@ -1059,7 +1059,8 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* TX data initialization
|
||||
*/
|
||||
static void rt2400pci_write_beacon(struct queue_entry *entry)
|
||||
static void rt2400pci_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct queue_entry_priv_pci *entry_priv = entry->priv_data;
|
||||
|
|
|
@ -1216,7 +1216,8 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* TX data initialization
|
||||
*/
|
||||
static void rt2500pci_write_beacon(struct queue_entry *entry)
|
||||
static void rt2500pci_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct queue_entry_priv_pci *entry_priv = entry->priv_data;
|
||||
|
|
|
@ -1082,7 +1082,8 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
*/
|
||||
static void rt2500usb_beacondone(struct urb *urb);
|
||||
|
||||
static void rt2500usb_write_beacon(struct queue_entry *entry)
|
||||
static void rt2500usb_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
|
||||
|
|
|
@ -678,7 +678,8 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* TX data initialization
|
||||
*/
|
||||
static void rt2800pci_write_beacon(struct queue_entry *entry)
|
||||
static void rt2800pci_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
|
||||
|
|
|
@ -427,7 +427,8 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* TX data initialization
|
||||
*/
|
||||
static void rt2800usb_write_beacon(struct queue_entry *entry)
|
||||
static void rt2800usb_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
|
||||
|
|
|
@ -551,7 +551,8 @@ struct rt2x00lib_ops {
|
|||
struct txentry_desc *txdesc);
|
||||
int (*write_tx_data) (struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc);
|
||||
void (*write_beacon) (struct queue_entry *entry);
|
||||
void (*write_beacon) (struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc);
|
||||
int (*get_tx_data_len) (struct queue_entry *entry);
|
||||
void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,
|
||||
const enum data_queue_qid queue);
|
||||
|
|
|
@ -604,7 +604,7 @@ int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* Send beacon to hardware and enable beacon genaration..
|
||||
*/
|
||||
rt2x00dev->ops->lib->write_beacon(intf->beacon);
|
||||
rt2x00dev->ops->lib->write_beacon(intf->beacon, &txdesc);
|
||||
|
||||
mutex_unlock(&intf->beacon_skb_mutex);
|
||||
|
||||
|
|
|
@ -1842,7 +1842,8 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* TX data initialization
|
||||
*/
|
||||
static void rt61pci_write_beacon(struct queue_entry *entry)
|
||||
static void rt61pci_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
|
||||
|
|
|
@ -1504,7 +1504,8 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
/*
|
||||
* TX data initialization
|
||||
*/
|
||||
static void rt73usb_write_beacon(struct queue_entry *entry)
|
||||
static void rt73usb_write_beacon(struct queue_entry *entry,
|
||||
struct txentry_desc *txdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
|
||||
|
|
Loading…
Reference in New Issue