leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging:r8188eu: inline unprotect_frame() in mon_recv_decrypted_recv()

Browse Source 
It is useful to remove IV/ICV from rtl88eu_mon_recv_hook().
Also unprotect_frame() will be very short without skb_(pull|trim).

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov 2017-05-02 09:01:41 +03:00 committed by Greg Kroah-Hartman
parent d86e16da6a
commit 02b19b4c49
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/rtl8188eu/os_dep/mon.c
View File

@ -70,6 +70,8 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data,
int data_len, int iv_len, int icv_len) int data_len, int iv_len, int icv_len)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct ieee80211_hdr *hdr;
int hdr_len;
skb = netdev_alloc_skb(dev, data_len); skb = netdev_alloc_skb(dev, data_len);
if (!skb) if (!skb)
@ -80,7 +82,19 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data,
* Frame data is not encrypted. Strip off protection so * Frame data is not encrypted. Strip off protection so
* userspace doesn't think that it is. * userspace doesn't think that it is.
*/ */
unprotect_frame(skb, iv_len, icv_len);
hdr = (struct ieee80211_hdr *)skb->data;
hdr_len = ieee80211_hdrlen(hdr->frame_control);
if (skb->len < hdr_len + iv_len + icv_len) {
if (ieee80211_has_protected(hdr->frame_control)) {
hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_PROTECTED);
memmove(skb->data + iv_len, skb->data, hdr_len);
skb_pull(skb, iv_len);
skb_trim(skb, skb->len - icv_len);
}
}
skb->ip_summed = CHECKSUM_UNNECESSARY; skb->ip_summed = CHECKSUM_UNNECESSARY;
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);