git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-davem-2017-10-11' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
Documentation
/
driver-api
/
80211
/
cfg80211.rst
diff --git
a/Documentation/driver-api/80211/cfg80211.rst
b/Documentation/driver-api/80211/cfg80211.rst
index 8ffac57e1f5b7ddd0b56547258f604d06816e9bd..eeab91b59457e74f16681eb196356213b9e06173 100644
(file)
--- a/
Documentation/driver-api/80211/cfg80211.rst
+++ b/
Documentation/driver-api/80211/cfg80211.rst
@@
-299,9
+299,6
@@
Data path helpers
.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_data_to_8023
-.. kernel-doc:: include/net/cfg80211.h
- :functions: ieee80211_data_from_8023
-
.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_amsdu_to_8023s