aboutsummaryrefslogtreecommitdiff
path: root/net/802
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-08-09 19:31:17 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 15:31:42 -0700
commit6f1cf16582160c4839f05007c978743911aa022b (patch)
tree78c87b929e9c0469869db1c91a6691fe6ca689c6 /net/802
parentb0573dea1fb32ebc72ffa05980fd840df1d80860 (diff)
downloadlinux-6f1cf16582160c4839f05007c978743911aa022b.tar.gz
[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 'net/802')
-rw-r--r--net/802/hippi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 051e8af56a7..cb45ae1310c 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -51,6 +51,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,
unsigned len)
{
struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN);
+ struct hippi_cb *hcb = (struct hippi_cb *) skb->cb;
if (!len){
len = skb->len - HIPPI_HLEN;
@@ -84,9 +85,10 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,
if (daddr)
{
memcpy(hip->le.dest_switch_addr, daddr + 3, 3);
- memcpy(&skb->private.ifield, daddr + 2, 4);
+ memcpy(&hcb->ifield, daddr + 2, 4);
return HIPPI_HLEN;
}
+ hcb->ifield = 0;
return -((int)HIPPI_HLEN);
}