diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/ieee80211.h | 3 | ||||
-rw-r--r-- | include/net/ieee80211softmac.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 293e920ca5..d5147770ad 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -1247,7 +1247,8 @@ extern int ieee80211_set_encryption(struct ieee80211_device *ieee); | |||
1247 | extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); | 1247 | extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); |
1248 | extern void ieee80211_txb_free(struct ieee80211_txb *); | 1248 | extern void ieee80211_txb_free(struct ieee80211_txb *); |
1249 | extern int ieee80211_tx_frame(struct ieee80211_device *ieee, | 1249 | extern int ieee80211_tx_frame(struct ieee80211_device *ieee, |
1250 | struct ieee80211_hdr *frame, int len); | 1250 | struct ieee80211_hdr *frame, int hdr_len, |
1251 | int total_len, int encrypt_mpdu); | ||
1251 | 1252 | ||
1252 | /* ieee80211_rx.c */ | 1253 | /* ieee80211_rx.c */ |
1253 | extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | 1254 | extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, |
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index 703463a882..7a483ab402 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h | |||
@@ -310,7 +310,7 @@ extern void ieee80211softmac_stop(struct net_device *dev); | |||
310 | * - context set to the context data you want passed | 310 | * - context set to the context data you want passed |
311 | * The return value is 0, or an error. | 311 | * The return value is 0, or an error. |
312 | */ | 312 | */ |
313 | typedef void (*notify_function_ptr)(struct net_device *dev, void *context); | 313 | typedef void (*notify_function_ptr)(struct net_device *dev, int event_type, void *context); |
314 | 314 | ||
315 | #define ieee80211softmac_notify(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_KERNEL); | 315 | #define ieee80211softmac_notify(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_KERNEL); |
316 | #define ieee80211softmac_notify_atomic(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_ATOMIC); | 316 | #define ieee80211softmac_notify_atomic(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_ATOMIC); |