aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r--include/linux/skbuff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7fc9a3aaa1c9..e3ae544b3956 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -216,7 +216,7 @@ enum {
216 * @tail: Tail pointer 216 * @tail: Tail pointer
217 * @end: End pointer 217 * @end: End pointer
218 * @destructor: Destruct function 218 * @destructor: Destruct function
219 * @nfmark: Can be used for communication between hooks 219 * @mark: Generic packet mark
220 * @nfct: Associated connection, if any 220 * @nfct: Associated connection, if any
221 * @ipvs_property: skbuff is owned by ipvs 221 * @ipvs_property: skbuff is owned by ipvs
222 * @nfctinfo: Relationship of this skb to the connection 222 * @nfctinfo: Relationship of this skb to the connection
@@ -295,7 +295,6 @@ struct sk_buff {
295#ifdef CONFIG_BRIDGE_NETFILTER 295#ifdef CONFIG_BRIDGE_NETFILTER
296 struct nf_bridge_info *nf_bridge; 296 struct nf_bridge_info *nf_bridge;
297#endif 297#endif
298 __u32 nfmark;
299#endif /* CONFIG_NETFILTER */ 298#endif /* CONFIG_NETFILTER */
300#ifdef CONFIG_NET_SCHED 299#ifdef CONFIG_NET_SCHED
301 __u16 tc_index; /* traffic control index */ 300 __u16 tc_index; /* traffic control index */
@@ -310,6 +309,7 @@ struct sk_buff {
310 __u32 secmark; 309 __u32 secmark;
311#endif 310#endif
312 311
312 __u32 mark;
313 313
314 /* These elements must be at the end, see alloc_skb() for details. */ 314 /* These elements must be at the end, see alloc_skb() for details. */
315 unsigned int truesize; 315 unsigned int truesize;