diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-08-09 19:31:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 15:31:42 -0700 |
| commit | 6f1cf16582160c4839f05007c978743911aa022b (patch) | |
| tree | 78c87b929e9c0469869db1c91a6691fe6ca689c6 /include | |
| parent | b0573dea1fb32ebc72ffa05980fd840df1d80860 (diff) | |
| download | linux-3.10-6f1cf16582160c4839f05007c978743911aa022b.tar.gz linux-3.10-6f1cf16582160c4839f05007c978743911aa022b.tar.bz2 linux-3.10-6f1cf16582160c4839f05007c978743911aa022b.zip | |
[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')
| -rw-r--r-- | include/linux/hippidevice.h | 5 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h index 9debe6bbe5f..9bc3b688d2e 100644 --- a/include/linux/hippidevice.h +++ b/include/linux/hippidevice.h @@ -26,6 +26,11 @@ #include <linux/if_hippi.h> #ifdef __KERNEL__ + +struct hippi_cb { + __u32 ifield; +}; + extern unsigned short hippi_type_trans(struct sk_buff *skb, struct net_device *dev); diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f10a8b9628b..4aeadb10258 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -193,7 +193,6 @@ struct skb_shared_info { * @nfct: Associated connection, if any * @nfctinfo: Relationship of this skb to the connection * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c - * @private: Data which is private to the HIPPI implementation * @tc_index: Traffic control index * @tc_verd: traffic control verdict */ @@ -265,11 +264,6 @@ struct sk_buff { struct nf_bridge_info *nf_bridge; #endif #endif /* CONFIG_NETFILTER */ -#if defined(CONFIG_HIPPI) - union { - __u32 ifield; - } private; -#endif #ifdef CONFIG_NET_SCHED __u32 tc_index; /* traffic control index */ #ifdef CONFIG_NET_CLS_ACT |