aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
237 <sect1><title>Driver Support</title> 237 <sect1><title>Driver Support</title>
238!Enet/core/dev.c 238!Enet/core/dev.c
239!Enet/ethernet/eth.c 239!Enet/ethernet/eth.c
240!Einclude/linux/etherdevice.h 240!Iinclude/linux/etherdevice.h
241!Enet/core/wireless.c 241<!-- FIXME: Removed for now since no structured comments in source
242X!Enet/core/wireless.c
243-->
242 </sect1> 244 </sect1>
243 <sect1><title>Synchronous PPP</title> 245 <sect1><title>Synchronous PPP</title>
244!Edrivers/net/wan/syncppp.c 246!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 {
206 * @nfct: Associated connection, if any 206 * @nfct: Associated connection, if any
207 * @ipvs_property: skbuff is owned by ipvs 207 * @ipvs_property: skbuff is owned by ipvs
208 * @nfctinfo: Relationship of this skb to the connection 208 * @nfctinfo: Relationship of this skb to the connection
209 * @nfct_reasm: netfilter conntrack re-assembly pointer
209 * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c 210 * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
210 * @tc_index: Traffic control index 211 * @tc_index: Traffic control index
211 * @tc_verd: traffic control verdict 212 * @tc_verd: traffic control verdict