git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
p54
/
lmac.h
diff --git
a/drivers/net/wireless/p54/lmac.h
b/drivers/net/wireless/p54/lmac.h
index
04b63ec
..
eb581ab
100644
(file)
--- a/
drivers/net/wireless/p54/lmac.h
+++ b/
drivers/net/wireless/p54/lmac.h
@@
-526,7
+526,7
@@
int p54_init_leds(struct p54_common *priv);
void p54_unregister_leds(struct p54_common *priv);
/* xmit functions */
void p54_unregister_leds(struct p54_common *priv);
/* xmit functions */
-
int
p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb);
+
void
p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb);
int p54_tx_cancel(struct p54_common *priv, __le32 req_id);
void p54_tx(struct p54_common *priv, struct sk_buff *skb);
int p54_tx_cancel(struct p54_common *priv, __le32 req_id);
void p54_tx(struct p54_common *priv, struct sk_buff *skb);
@@
-551,6
+551,7
@@
int p54_upload_key(struct p54_common *priv, u8 algo, int slot,
/* eeprom */
int p54_download_eeprom(struct p54_common *priv, void *buf,
u16 offset, u16 len);
/* eeprom */
int p54_download_eeprom(struct p54_common *priv, void *buf,
u16 offset, u16 len);
+struct p54_rssi_db_entry *p54_rssi_find(struct p54_common *p, const u16 freq);
/* utility */
u8 *p54_find_ie(struct sk_buff *skb, u8 ie);
/* utility */
u8 *p54_find_ie(struct sk_buff *skb, u8 ie);