diff options
| author |   Rami Rosen <ramirose@gmail.com> | 2008-06-09 16:00:45 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-06-09 16:00:45 -0700 |
| commit | e64bda89b8fe81cce9b4a20885d2c204c2d52532 (patch) | |
| tree | e3ca063a930cf20d39233287d46eb9155fe22d11 /net/ipv6/netfilter/ip6_queue.c | |
| parent | netfilter: nf_conntrack: remove unnecessary function declaration (diff) | |
| download | linux-dev-e64bda89b8fe81cce9b4a20885d2c204c2d52532.tar.xz linux-dev-e64bda89b8fe81cce9b4a20885d2c204c2d52532.zip | |
netfilter: {ip,ip6,nfnetlink}_queue: misc cleanups
- No need to perform data_len = 0 in the switch command, since data_len
is initialized to 0 in the beginning of the ipq_build_packet_message()
method.
- {ip,ip6}_queue: We can reach nlmsg_failure only from one place; skb is
sure to be NULL when getting there; since skb is NULL, there is no need
to check this fact and call kfree_skb().
Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 2eff3ae8977d..1b8815f6153d 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -159,7 +159,6 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) case IPQ_COPY_META: case IPQ_COPY_NONE: size = NLMSG_SPACE(sizeof(*pmsg)); - data_len = 0; break; case IPQ_COPY_PACKET: @@ -226,8 +225,6 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) return skb; nlmsg_failure: - if (skb) - kfree_skb(skb); *errp = -EINVAL; printk(KERN_ERR "ip6_queue: error creating packet message\n"); return NULL; |