diff options
| author | Sean MacLennan | 2011-12-20 05:20:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-12-22 22:48:59 +0100 |
| commit | 32c44cb5b9fdc6eaa445bd622008dd672a3dd1a7 (patch) | |
| tree | 019dcb35135328fc149404b61dbec5fdc4e84b12 /drivers/staging/rtl8192e/rtllib_tx.c | |
| parent | staging/rtl8192e: Add lib80211.h to rtllib.h (diff) | |
| download | kernel-qcow2-linux-32c44cb5b9fdc6eaa445bd622008dd672a3dd1a7.tar.gz kernel-qcow2-linux-32c44cb5b9fdc6eaa445bd622008dd672a3dd1a7.tar.xz kernel-qcow2-linux-32c44cb5b9fdc6eaa445bd622008dd672a3dd1a7.zip | |
staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
Convert rtllib_crypt_data to lib80211_crypt_data and
rtllib_crypt_ops to lib80211_crypt_ops.
This is almost a 1:1 replacement, only extra_prefix_len and
extra_postfix_len changed.
Signed-off-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_tx.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_tx.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index b8135be96e47..b038357b6175 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -179,7 +179,7 @@ inline int rtllib_put_snap(u8 *data, u16 h_proto) int rtllib_encrypt_fragment(struct rtllib_device *ieee, struct sk_buff *frag, int hdr_len) { - struct rtllib_crypt_data *crypt = NULL; + struct lib80211_crypt_data *crypt = NULL; int res; crypt = ieee->crypt[ieee->tx_keyidx]; @@ -568,7 +568,7 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) }; u8 dest[ETH_ALEN], src[ETH_ALEN]; int qos_actived = ieee->current_network.qos_data.active; - struct rtllib_crypt_data *crypt = NULL; + struct lib80211_crypt_data *crypt = NULL; struct cb_desc *tcb_desc; u8 bIsMulticast = false; u8 IsAmsdu = false; @@ -741,8 +741,10 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) /* Each fragment may need to have room for encryptiong * pre/postfix */ if (encrypt) { - bytes_per_frag -= crypt->ops->extra_prefix_len + - crypt->ops->extra_postfix_len; + bytes_per_frag -= crypt->ops->extra_mpdu_prefix_len + + crypt->ops->extra_mpdu_postfix_len + + crypt->ops->extra_msdu_prefix_len + + crypt->ops->extra_msdu_postfix_len; } /* Number of fragments is the total bytes_per_frag / * payload_per_fragment */ @@ -790,7 +792,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) else tcb_desc->bHwSec = 0; skb_reserve(skb_frag, - crypt->ops->extra_prefix_len); + crypt->ops->extra_mpdu_prefix_len + + crypt->ops->extra_msdu_prefix_len); } else { tcb_desc->bHwSec = 0; } |