aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/hippidevice.h5
-rw-r--r--include/linux/skbuff.h6
2 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h
index 9debe6bbe5f0..9bc3b688d2ee 100644
--- a/include/linux/hippidevice.h
+++ b/include/linux/hippidevice.h
@@ -26,6 +26,11 @@
26#include <linux/if_hippi.h> 26#include <linux/if_hippi.h>
27 27
28#ifdef __KERNEL__ 28#ifdef __KERNEL__
29
30struct hippi_cb {
31 __u32 ifield;
32};
33
29extern unsigned short hippi_type_trans(struct sk_buff *skb, 34extern unsigned short hippi_type_trans(struct sk_buff *skb,
30 struct net_device *dev); 35 struct net_device *dev);
31 36
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