projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
[powerpc.git]
/
net
/
sched
/
cls_rsvp.h
diff --git
a/net/sched/cls_rsvp.h
b/net/sched/cls_rsvp.h
index
7853621
..
22f9ede
100644
(file)
--- a/
net/sched/cls_rsvp.h
+++ b/
net/sched/cls_rsvp.h
@@
-143,9
+143,9
@@
static int rsvp_classify(struct sk_buff *skb, struct tcf_proto *tp,
u8 tunnelid = 0;
u8 *xprt;
#if RSVP_DST_LEN == 4
u8 tunnelid = 0;
u8 *xprt;
#if RSVP_DST_LEN == 4
- struct ipv6hdr *nhptr =
skb->nh.ipv6h
;
+ struct ipv6hdr *nhptr =
ipv6_hdr(skb)
;
#else
#else
- struct iphdr *nhptr =
skb->nh.iph
;
+ struct iphdr *nhptr =
ip_hdr(skb)
;
#endif
restart:
#endif
restart:
@@
-160,7
+160,7
@@
restart:
dst = &nhptr->daddr;
protocol = nhptr->protocol;
xprt = ((u8*)nhptr) + (nhptr->ihl<<2);
dst = &nhptr->daddr;
protocol = nhptr->protocol;
xprt = ((u8*)nhptr) + (nhptr->ihl<<2);
- if (nhptr->frag_off
&__constant_
htons(IP_MF|IP_OFFSET))
+ if (nhptr->frag_off
&
htons(IP_MF|IP_OFFSET))
return -1;
#endif
return -1;
#endif
@@
-593,7
+593,7
@@
static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
{
struct rsvp_filter *f = (struct rsvp_filter*)fh;
struct rsvp_session *s;
{
struct rsvp_filter *f = (struct rsvp_filter*)fh;
struct rsvp_session *s;
- unsigned char
*b = skb->tail
;
+ unsigned char
*b = skb_tail_pointer(skb)
;
struct rtattr *rta;
struct tc_rsvp_pinfo pinfo;
struct rtattr *rta;
struct tc_rsvp_pinfo pinfo;
@@
-623,14
+623,14
@@
static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
if (tcf_exts_dump(skb, &f->exts, &rsvp_ext_map) < 0)
goto rtattr_failure;
if (tcf_exts_dump(skb, &f->exts, &rsvp_ext_map) < 0)
goto rtattr_failure;
- rta->rta_len = skb
->tail
- b;
+ rta->rta_len = skb
_tail_pointer(skb)
- b;
if (tcf_exts_dump_stats(skb, &f->exts, &rsvp_ext_map) < 0)
goto rtattr_failure;
return skb->len;
rtattr_failure:
if (tcf_exts_dump_stats(skb, &f->exts, &rsvp_ext_map) < 0)
goto rtattr_failure;
return skb->len;
rtattr_failure:
-
skb_trim(skb, b - skb->data
);
+
nlmsg_trim(skb, b
);
return -1;
}
return -1;
}