diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-25 04:21:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-25 04:21:58 +0200 |
| commit | 19725496da5602b401eae389736ab00d1817e264 (patch) | |
| tree | 4c1a94bf0121769110f1b9c08ee337a55679a48a /net/mac80211/rx.c | |
| parent | net/sched: add skbprio scheduler (diff) | |
| parent | Merge tag 'mips_fixes_4.18_4' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-19725496da5602b401eae389736ab00d1817e264.tar.xz linux-19725496da5602b401eae389736ab00d1817e264.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index a16ba568e2a3..64742f2765c4 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2370,11 +2370,8 @@ static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb, sdata->control_port_over_nl80211)) { struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); bool noencrypt = status->flag & RX_FLAG_DECRYPTED; - struct ethhdr *ehdr = eth_hdr(skb); - cfg80211_rx_control_port(dev, skb->data, skb->len, - ehdr->h_source, - be16_to_cpu(skb->protocol), noencrypt); + cfg80211_rx_control_port(dev, skb, noencrypt); dev_kfree_skb(skb); } else { /* deliver to local stack */ |