git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_80211_tx.c
diff --git
a/drivers/net/wireless/hostap/hostap_80211_tx.c
b/drivers/net/wireless/hostap/hostap_80211_tx.c
index
4a5be70
..
5f398bd
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/
drivers/net/wireless/hostap/hostap_80211_tx.c
@@
-299,8
+299,8
@@
int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* Called only from software IRQ */
/* Called only from software IRQ */
-st
atic st
ruct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
-
struct ieee80211_crypt_data *crypt)
+struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
+ struct ieee80211_crypt_data *crypt)
{
struct hostap_interface *iface;
local_info_t *local;
{
struct hostap_interface *iface;
local_info_t *local;
@@
-317,7
+317,7
@@
static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
}
if (local->tkip_countermeasures &&
}
if (local->tkip_countermeasures &&
- strcmp(crypt->ops->name, "TKIP") == 0) {
+
crypt && crypt->ops &&
strcmp(crypt->ops->name, "TKIP") == 0) {
hdr = (struct ieee80211_hdr_4addr *) skb->data;
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
hdr = (struct ieee80211_hdr_4addr *) skb->data;
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
@@
-534,4
+534,6
@@
int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
}
+EXPORT_SYMBOL(hostap_dump_tx_80211);
+EXPORT_SYMBOL(hostap_tx_encrypt);
EXPORT_SYMBOL(hostap_master_start_xmit);
EXPORT_SYMBOL(hostap_master_start_xmit);