diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-26 02:06:12 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:26:37 -0400 |
commit | dc5fc579b90ed0a9a4e55b0218cdbaf0a8cf2e67 (patch) | |
tree | 673dbb425c2b09b4256ef71f89dfc5cc01944386 /net/decnet | |
parent | a36ca733375860b389c15ffdf6a5f92df64a33b6 (diff) |
[NETLINK]: Use nlmsg_trim() where appropriate
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_route.c | 3 | ||||
-rw-r--r-- | net/decnet/dn_table.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 9678b096b844..2ae35ef1f077 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -77,6 +77,7 @@ | |||
77 | #include <linux/rcupdate.h> | 77 | #include <linux/rcupdate.h> |
78 | #include <linux/times.h> | 78 | #include <linux/times.h> |
79 | #include <asm/errno.h> | 79 | #include <asm/errno.h> |
80 | #include <net/netlink.h> | ||
80 | #include <net/neighbour.h> | 81 | #include <net/neighbour.h> |
81 | #include <net/dst.h> | 82 | #include <net/dst.h> |
82 | #include <net/flow.h> | 83 | #include <net/flow.h> |
@@ -1514,7 +1515,7 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, | |||
1514 | 1515 | ||
1515 | nlmsg_failure: | 1516 | nlmsg_failure: |
1516 | rtattr_failure: | 1517 | rtattr_failure: |
1517 | skb_trim(skb, b - skb->data); | 1518 | nlmsg_trim(skb, b); |
1518 | return -1; | 1519 | return -1; |
1519 | } | 1520 | } |
1520 | 1521 | ||
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 544c45540746..d6615c9361e9 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
29 | #include <linux/route.h> /* RTF_xxx */ | 29 | #include <linux/route.h> /* RTF_xxx */ |
30 | #include <net/neighbour.h> | 30 | #include <net/neighbour.h> |
31 | #include <net/netlink.h> | ||
31 | #include <net/dst.h> | 32 | #include <net/dst.h> |
32 | #include <net/flow.h> | 33 | #include <net/flow.h> |
33 | #include <net/fib_rules.h> | 34 | #include <net/fib_rules.h> |
@@ -349,7 +350,7 @@ static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, | |||
349 | 350 | ||
350 | nlmsg_failure: | 351 | nlmsg_failure: |
351 | rtattr_failure: | 352 | rtattr_failure: |
352 | skb_trim(skb, b - skb->data); | 353 | nlmsg_trim(skb, b); |
353 | return -EMSGSIZE; | 354 | return -EMSGSIZE; |
354 | } | 355 | } |
355 | 356 | ||