projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETLINK]: Use nlmsg_trim() where appropriate
[deliverable/linux.git]
/
net
/
sched
/
cls_route.c
diff --git
a/net/sched/cls_route.c
b/net/sched/cls_route.c
index d3aea730d4c85d923cda240af52272d91cf6e5da..e92d716c9158f29f9d4b733ce01963fd98b713cd 100644
(file)
--- a/
net/sched/cls_route.c
+++ b/
net/sched/cls_route.c
@@
-15,7
+15,6
@@
#include <linux/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
@@
-29,6
+28,7
@@
#include <linux/etherdevice.h>
#include <linux/notifier.h>
#include <net/ip.h>
#include <linux/etherdevice.h>
#include <linux/notifier.h>
#include <net/ip.h>
+#include <net/netlink.h>
#include <net/route.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <net/route.h>
#include <linux/skbuff.h>
#include <net/sock.h>
@@
-94,7
+94,7
@@
void route4_reset_fastmap(struct net_device *dev, struct route4_head *head, u32
spin_unlock_bh(&dev->queue_lock);
}
spin_unlock_bh(&dev->queue_lock);
}
-static
void __inline__
+static
inline void
route4_set_fastmap(struct route4_head *head, u32 id, int iif,
struct route4_filter *f)
{
route4_set_fastmap(struct route4_head *head, u32 id, int iif,
struct route4_filter *f)
{
@@
-563,7
+563,7
@@
static int route4_dump(struct tcf_proto *tp, unsigned long fh,
struct sk_buff *skb, struct tcmsg *t)
{
struct route4_filter *f = (struct route4_filter*)fh;
struct sk_buff *skb, struct tcmsg *t)
{
struct route4_filter *f = (struct route4_filter*)fh;
- unsigned char
*b = skb->tail
;
+ unsigned char
*b = skb_tail_pointer(skb)
;
struct rtattr *rta;
u32 id;
struct rtattr *rta;
u32 id;
@@
-592,7
+592,7
@@
static int route4_dump(struct tcf_proto *tp, unsigned long fh,
if (tcf_exts_dump(skb, &f->exts, &route_ext_map) < 0)
goto rtattr_failure;
if (tcf_exts_dump(skb, &f->exts, &route_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, &route_ext_map) < 0)
goto rtattr_failure;
if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0)
goto rtattr_failure;
@@
-600,7
+600,7
@@
static int route4_dump(struct tcf_proto *tp, unsigned long fh,
return skb->len;
rtattr_failure:
return skb->len;
rtattr_failure:
-
skb_trim(skb, b - skb->data
);
+
nlmsg_trim(skb, b
);
return -1;
}
return -1;
}
This page took
0.316025 seconds
and
5
git commands to generate.