diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:03:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:06:46 +1100 |
| commit | cf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch) | |
| tree | 8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/wireless/b43/xmit.h | |
| parent | eabeb7dac4934602a90b14649c07c13eb7e43d90 (diff) | |
| parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/wireless/b43/xmit.h')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h index 0215faf47541..4fb2a190f7a7 100644 --- a/drivers/net/wireless/b43/xmit.h +++ b/drivers/net/wireless/b43/xmit.h @@ -178,7 +178,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, u8 * txhdr, const unsigned char *fragment_data, unsigned int fragment_len, - const struct ieee80211_tx_info *txctl, u16 cookie); + struct ieee80211_tx_info *txctl, u16 cookie); /* Transmit Status */ struct b43_txstatus { @@ -294,7 +294,8 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr); void b43_handle_txstatus(struct b43_wldev *dev, const struct b43_txstatus *status); -bool b43_fill_txstatus_report(struct ieee80211_tx_info *report, +bool b43_fill_txstatus_report(struct b43_wldev *dev, + struct ieee80211_tx_info *report, const struct b43_txstatus *status); void b43_tx_suspend(struct b43_wldev *dev); |