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/net/ieee80211.h | |
| parent | 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 (diff) | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 293e920ca59d..d5147770ad47 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, |