aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-08-09 22:31:17 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 18:31:42 -0400
commit6f1cf16582160c4839f05007c978743911aa022b (patch)
tree78c87b929e9c0469869db1c91a6691fe6ca689c6 /include/linux/skbuff.h
parentb0573dea1fb32ebc72ffa05980fd840df1d80860 (diff)
[NET]: Remove HIPPI private from skbuff.h
This removes the private element from skbuff, that is only used by HIPPI. Instead it uses skb->cb[] to hold the additional data that is needed in the output path from hard_header to device driver. PS: The only qdisc that might potentially corrupt this cb[] is if netem was used over HIPPI. I will take care of that by fixing netem to use skb->stamp. I don't expect many users of netem over HIPPI Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r--include/linux/skbuff.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f10a8b9628b0..4aeadb102589 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -193,7 +193,6 @@ struct skb_shared_info {
193 * @nfct: Associated connection, if any 193 * @nfct: Associated connection, if any
194 * @nfctinfo: Relationship of this skb to the connection 194 * @nfctinfo: Relationship of this skb to the connection
195 * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c 195 * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
196 * @private: Data which is private to the HIPPI implementation
197 * @tc_index: Traffic control index 196 * @tc_index: Traffic control index
198 * @tc_verd: traffic control verdict 197 * @tc_verd: traffic control verdict
199 */ 198 */
@@ -265,11 +264,6 @@ struct sk_buff {
265 struct nf_bridge_info *nf_bridge; 264 struct nf_bridge_info *nf_bridge;
266#endif 265#endif
267#endif /* CONFIG_NETFILTER */ 266#endif /* CONFIG_NETFILTER */
268#if defined(CONFIG_HIPPI)
269 union {
270 __u32 ifield;
271 } private;
272#endif
273#ifdef CONFIG_NET_SCHED 267#ifdef CONFIG_NET_SCHED
274 __u32 tc_index; /* traffic control index */ 268 __u32 tc_index; /* traffic control index */
275#ifdef CONFIG_NET_CLS_ACT 269#ifdef CONFIG_NET_CLS_ACT