summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2005-11-20 21:25:15 -0800
committerDavid S. Miller <davem@davemloft.net>2005-11-20 21:25:15 -0800
commit461ddf3b90bb149b99c3f675959c1bd6b11ed936 (patch)
tree12c7848560128e4344387eecdfc401369d46bb1c
parentb84f4cc977ec4a1260dc8d9165efc9319a93c2a2 (diff)
downloadblackbird-op-linux-461ddf3b90bb149b99c3f675959c1bd6b11ed936.tar.gz
blackbird-op-linux-461ddf3b90bb149b99c3f675959c1bd6b11ed936.zip
[NET]: kernel-doc fixes
Fix kernel-doc warnings in network files. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl6
-rw-r--r--include/linux/skbuff.h1
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 096aed62c326..767433bdbc40 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -237,8 +237,10 @@ X!Ilib/string.c
<sect1><title>Driver Support</title>
!Enet/core/dev.c
!Enet/ethernet/eth.c
-!Einclude/linux/etherdevice.h
-!Enet/core/wireless.c
+!Iinclude/linux/etherdevice.h
+<!-- FIXME: Removed for now since no structured comments in source
+X!Enet/core/wireless.c
+-->
</sect1>
<sect1><title>Synchronous PPP</title>
!Edrivers/net/wan/syncppp.c
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index e797d9ef0e28..8c5d6001a923 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -206,6 +206,7 @@ enum {
* @nfct: Associated connection, if any
* @ipvs_property: skbuff is owned by ipvs
* @nfctinfo: Relationship of this skb to the connection
+ * @nfct_reasm: netfilter conntrack re-assembly pointer
* @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
* @tc_index: Traffic control index
* @tc_verd: traffic control verdict
OpenPOWER on IntegriCloud