diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 23:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 23:23:54 -0400 |
| commit | 2aec609fb45e84d65bc8eabc7b650bbecb1cc179 (patch) | |
| tree | eb3e8a79604113392d0ee74b19dbc1dfce579c11 /net/netlabel/netlabel_unlabeled.c | |
| parent | 4c8894980010536915c4f5513ee180e3614aeca9 (diff) | |
| parent | 9076689ab07974a6f5d230fc241448f7a77e9078 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
| -rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index 52b2611a6e..56f8087292 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
| @@ -1107,11 +1107,7 @@ static int netlbl_unlabel_list(struct sk_buff *skb, struct genl_info *info) | |||
| 1107 | goto list_failure; | 1107 | goto list_failure; |
| 1108 | 1108 | ||
| 1109 | genlmsg_end(ans_skb, data); | 1109 | genlmsg_end(ans_skb, data); |
| 1110 | 1110 | return genlmsg_reply(ans_skb, info); | |
| 1111 | ret_val = genlmsg_reply(ans_skb, info); | ||
| 1112 | if (ret_val != 0) | ||
| 1113 | goto list_failure; | ||
| 1114 | return 0; | ||
| 1115 | 1111 | ||
| 1116 | list_failure: | 1112 | list_failure: |
| 1117 | kfree_skb(ans_skb); | 1113 | kfree_skb(ans_skb); |