summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichal Januszewski <spock@gentoo.org>2007-10-30 20:41:49 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-30 21:29:47 -0700
commit6cf92e98a48ba4bd5aeb8932b3844d3f8eacac76 (patch)
treec1a1c5e57339fe7f9d2a9efad92d949eecedf366 /drivers
parentbe48be08a829db09a4f786f44a1872ef0f533c85 (diff)
downloadlinux-6cf92e98a48ba4bd5aeb8932b3844d3f8eacac76.tar.gz
linux-6cf92e98a48ba4bd5aeb8932b3844d3f8eacac76.tar.bz2
linux-6cf92e98a48ba4bd5aeb8932b3844d3f8eacac76.zip
[CONNECTOR]: Fix a spurious kfree_skb() call
Remove a spurious call to kfree_skb() in the connector rx_skb handler. This fixes a regression introduced by the '[NET]: make netlink user -> kernel interface synchronious' patch (cd40b7d3983c708aabe3d3008ec64ffce56d33b0) Signed-off-by: Michal Januszewski <spock@gentoo.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/connector/connector.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 0e328d387af4..6883fcb79ad3 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -218,7 +218,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
skb->len < nlh->nlmsg_len ||
nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {
kfree_skb(skb);
- goto out;
+ return;
}
len = NLMSG_ALIGN(nlh->nlmsg_len);
@@ -229,9 +229,6 @@ static void cn_rx_skb(struct sk_buff *__skb)
if (err < 0)
kfree_skb(skb);
}
-
-out:
- kfree_skb(__skb);
}
/*