diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-25 00:01:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-25 00:01:29 +0100 |
| commit | 4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (patch) | |
| tree | 0789ba36d96dba330416a1e6a9a68e891a78802a /drivers/net/wireless/rt2x00/rt2x00lib.h | |
| parent | net/ipv6: Move && and || to end of previous line (diff) | |
| parent | ath9k: set ps_default as false (diff) | |
| download | linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.tar.xz linux-4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00lib.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00lib.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h index c1f48acaee41..be2e37fb4071 100644 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h @@ -162,8 +162,10 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length); * rt2x00queue_write_tx_frame - Write TX frame to hardware * @queue: Queue over which the frame should be send * @skb: The skb to send + * @local: frame is not from mac80211 */ -int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb); +int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, + bool local); /** * rt2x00queue_update_beacon - Send new beacon from mac80211 to hardware |