diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-21 02:10:19 +0300 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-21 07:09:05 +0300 |
| commit | 81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91 (patch) | |
| tree | 40370ca95f416fd88cb93e5c252623e282b3553e /include/net/cfg80211.h | |
| parent | 8cfd23e6740158817d2045915f6ea5a2daf11bce (diff) | |
| parent | 938049e18dca57bcd2f93986fc1cbb5a83cdf027 (diff) | |
| download | linux-81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflicts with conntrack template fixes.
Conflicts:
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_synproxy_core.c
net/netfilter/xt_CT.c
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 883fe1e7c5a1..f0889a247643 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2369,8 +2369,7 @@ struct cfg80211_qos_map { * method returns 0.) * * @mgmt_frame_register: Notify driver that a management frame type was - * registered. Note that this callback may not sleep, and cannot run - * concurrently with itself. + * registered. The callback is allowed to sleep. * * @set_antenna: Set antenna configuration (tx_ant, rx_ant) on the device. * Parameters are bitmaps of allowed antennas to use for TX/RX. Drivers may |