diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/802/hippi.c | 4 | ||||
-rw-r--r-- | net/core/skbuff.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c index 051e8af56a77..cb45ae1310cb 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, | |||
51 | unsigned len) | 51 | unsigned len) |
52 | { | 52 | { |
53 | struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN); | 53 | struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN); |
54 | struct hippi_cb *hcb = (struct hippi_cb *) skb->cb; | ||
54 | 55 | ||
55 | if (!len){ | 56 | if (!len){ |
56 | len = skb->len - HIPPI_HLEN; | 57 | len = skb->len - HIPPI_HLEN; |
@@ -84,9 +85,10 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev, | |||
84 | if (daddr) | 85 | if (daddr) |
85 | { | 86 | { |
86 | memcpy(hip->le.dest_switch_addr, daddr + 3, 3); | 87 | memcpy(hip->le.dest_switch_addr, daddr + 3, 3); |
87 | memcpy(&skb->private.ifield, daddr + 2, 4); | 88 | memcpy(&hcb->ifield, daddr + 2, 4); |
88 | return HIPPI_HLEN; | 89 | return HIPPI_HLEN; |
89 | } | 90 | } |
91 | hcb->ifield = 0; | ||
90 | return -((int)HIPPI_HLEN); | 92 | return -((int)HIPPI_HLEN); |
91 | } | 93 | } |
92 | 94 | ||
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 8896e6f8aa42..16df7bd77e78 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -365,9 +365,6 @@ struct sk_buff *skb_clone(struct sk_buff *skb, unsigned int __nocast gfp_mask) | |||
365 | nf_bridge_get(skb->nf_bridge); | 365 | nf_bridge_get(skb->nf_bridge); |
366 | #endif | 366 | #endif |
367 | #endif /*CONFIG_NETFILTER*/ | 367 | #endif /*CONFIG_NETFILTER*/ |
368 | #if defined(CONFIG_HIPPI) | ||
369 | C(private); | ||
370 | #endif | ||
371 | #ifdef CONFIG_NET_SCHED | 368 | #ifdef CONFIG_NET_SCHED |
372 | C(tc_index); | 369 | C(tc_index); |
373 | #ifdef CONFIG_NET_CLS_ACT | 370 | #ifdef CONFIG_NET_CLS_ACT |