diff options
| author |   Thomas Graf <tgraf@suug.ch> | 2005-06-18 22:51:26 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2005-06-18 22:51:26 -0700 |
| commit | c52a3f89f882b84fc422000655c023fe73e701cf (patch) | |
| tree | 25069c0f52b19bc0ffef80aa0cb41193e0a483f6 /include | |
| parent | [NEIGHBOUR]: Remove unused fields in struct neigh_parms and neigh_table (diff) | |
| download | linux-dev-c52a3f89f882b84fc422000655c023fe73e701cf.tar.xz linux-dev-c52a3f89f882b84fc422000655c023fe73e701cf.zip | |
[NETLINK]: Fix RTA_NEST_CANCEL().
Only skb_trim() if 'start' is non-NULL.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rtnetlink.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 5a5cda160267..6fff8c4c99c7 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -924,7 +924,8 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi (skb)->len; }) #define RTA_NEST_CANCEL(skb, start) \ -({ skb_trim(skb, (unsigned char *) (start) - (skb)->data); \ +({ if (start) \ + skb_trim(skb, (unsigned char *) (start) - (skb)->data); \ -1; }) #define RTA_GET_U32(rta) \ |