diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:48:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:48:25 -0400 |
| commit | ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 (patch) | |
| tree | d770bd8c536771cb3804abb51ed029d7dd9d30d2 /include | |
| parent | 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 (diff) | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
| download | linux-ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683.tar.gz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
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 293e920ca59d7..d5147770ad474 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -1247,7 +1247,8 @@ extern int ieee80211_set_encryption(struct ieee80211_device *ieee); extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); extern void ieee80211_txb_free(struct ieee80211_txb *); extern int ieee80211_tx_frame(struct ieee80211_device *ieee, - struct ieee80211_hdr *frame, int len); + struct ieee80211_hdr *frame, int hdr_len, + int total_len, int encrypt_mpdu); /* ieee80211_rx.c */ 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 703463a8828b2..7a483ab4022f9 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h @@ -310,7 +310,7 @@ extern void ieee80211softmac_stop(struct net_device *dev); * - context set to the context data you want passed * The return value is 0, or an error. */ -typedef void (*notify_function_ptr)(struct net_device *dev, void *context); +typedef void (*notify_function_ptr)(struct net_device *dev, int event_type, void *context); #define ieee80211softmac_notify(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_KERNEL); #define ieee80211softmac_notify_atomic(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_ATOMIC); |