diff --git a/[refs] b/[refs] index 9ce0409b9c9d..da2c36ba578b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b42f06517ae19d6519e9c54eac5ea58d00f3028 +refs/heads/master: f0da7ee410e63a1521af734c3970acc1470e8c50 diff --git a/trunk/net/bridge/netfilter/ebt_ulog.c b/trunk/net/bridge/netfilter/ebt_ulog.c index 26377e96fa1c..bf2a333ca7c7 100644 --- a/trunk/net/bridge/netfilter/ebt_ulog.c +++ b/trunk/net/bridge/netfilter/ebt_ulog.c @@ -216,7 +216,6 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb, nlmsg_failure: pr_debug("error during NLMSG_PUT. This should " "not happen, please report to author.\n"); - goto unlock; alloc_failure: goto unlock; }