diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-07-15 13:22:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-15 13:22:09 +0200 |
commit | 00e666a59443521409144fa14cc6ecd8a645d1d4 (patch) | |
tree | b55c99107c2f5e74b5ee3ba73d1ec375373fad68 /package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch | |
parent | 547a96b601a43c27e882cdabccdcf5bc5c0aad91 (diff) | |
parent | e68758459e172c9824a08b1063587e2b07e9a99f (diff) | |
download | master-187ad058-00e666a59443521409144fa14cc6ecd8a645d1d4.tar.gz master-187ad058-00e666a59443521409144fa14cc6ecd8a645d1d4.tar.bz2 master-187ad058-00e666a59443521409144fa14cc6ecd8a645d1d4.zip |
Merge pull request #32 from wigyori/master
Merge brcmfmac fixes from rmilecki
Diffstat (limited to 'package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch')
-rw-r--r-- | package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch b/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch index cea4975735..2583c78d3c 100644 --- a/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch +++ b/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch @@ -15,7 +15,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -4863,6 +4863,68 @@ exit: +@@ -4923,6 +4923,68 @@ exit: return err; } @@ -84,7 +84,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> static int brcmf_cfg80211_crit_proto_start(struct wiphy *wiphy, struct wireless_dev *wdev, enum nl80211_crit_proto_id proto, -@@ -5025,6 +5087,7 @@ static struct cfg80211_ops brcmf_cfg8021 +@@ -5085,6 +5147,7 @@ static struct cfg80211_ops brcmf_cfg8021 .mgmt_tx = brcmf_cfg80211_mgmt_tx, .remain_on_channel = brcmf_p2p_remain_on_channel, .cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel, |