From 916e0ffa6113f8cd8a6b0daecdd462fce253cd69 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 29 Jun 2007 00:55:09 +0000 Subject: [PATCH] mainline already includes Mark Huang's SMP fix --- net/bridge/netfilter/ebt_ulog.c | 3 --- net/netfilter/nfnetlink_log.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index a2ef7f86d..c1af68b5a 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c @@ -81,9 +81,6 @@ static void ulog_send(unsigned int nlgroup) if (ub->qlen > 1) ub->lastnlh->nlmsg_type = NLMSG_DONE; - if (!ub->skb) - return; - NETLINK_CB(ub->skb).dst_group = nlgroup + 1; netlink_broadcast(ebtulognl, ub->skb, 0, nlgroup + 1, GFP_ATOMIC); diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index b8622eb45..f7eafd804 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -372,9 +372,6 @@ __nfulnl_send(struct nfulnl_instance *inst) if (inst->qlen > 1) inst->lastnlh->nlmsg_type = NLMSG_DONE; - if (!inst->skb) - return 0; - status = nfnetlink_unicast(inst->skb, inst->peer_pid, MSG_DONTWAIT); if (status < 0) { UDEBUG("netlink_unicast() failed\n"); -- 2.47.0