diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00crypto.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00crypto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c index 30fbd3bbe08b..de36837dcf86 100644 --- a/drivers/net/wireless/rt2x00/rt2x00crypto.c +++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c | |||
@@ -154,7 +154,7 @@ void rt2x00crypto_tx_insert_iv(struct sk_buff *skb, unsigned int header_length) | |||
154 | skbdesc->flags &= ~SKBDESC_IV_STRIPPED; | 154 | skbdesc->flags &= ~SKBDESC_IV_STRIPPED; |
155 | } | 155 | } |
156 | 156 | ||
157 | void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, bool l2pad, | 157 | void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, |
158 | unsigned int header_length, | 158 | unsigned int header_length, |
159 | struct rxdone_entry_desc *rxdesc) | 159 | struct rxdone_entry_desc *rxdesc) |
160 | { | 160 | { |
@@ -199,7 +199,7 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, bool l2pad, | |||
199 | * move the header more then iv_len since we must | 199 | * move the header more then iv_len since we must |
200 | * make room for the payload move as well. | 200 | * make room for the payload move as well. |
201 | */ | 201 | */ |
202 | if (l2pad) { | 202 | if (rxdesc->dev_flags & RXDONE_L2PAD) { |
203 | skb_push(skb, iv_len - align); | 203 | skb_push(skb, iv_len - align); |
204 | skb_put(skb, icv_len); | 204 | skb_put(skb, icv_len); |
205 | 205 | ||
@@ -230,7 +230,7 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, bool l2pad, | |||
230 | * Move payload for alignment purposes. Note that | 230 | * Move payload for alignment purposes. Note that |
231 | * this is only needed when no l2 padding is present. | 231 | * this is only needed when no l2 padding is present. |
232 | */ | 232 | */ |
233 | if (!l2pad) { | 233 | if (!(rxdesc->dev_flags & RXDONE_L2PAD)) { |
234 | memmove(skb->data + transfer, | 234 | memmove(skb->data + transfer, |
235 | skb->data + transfer + align, | 235 | skb->data + transfer + align, |
236 | payload_len); | 236 | payload_len); |