Mark's fix for kernel panics on SMP machines have been merged into mainline.

The mainline fix uses Mark's code verbatim, except a few lines earlier w/in
the functions.

I'm just removing Mark's (now duplicate) code from source.

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index ffc1870..9f950db 100644 (file)
--- 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/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 58ba519..d46fd67 100644 (file)
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -124,11 +124,6 @@ static void ulog_send(unsigned int nlgroupnum)
        if (ub->qlen > 1)
                ub->lastnlh->nlmsg_type = NLMSG_DONE;
 
-       if (!ub->skb) {
-               DEBUGP("ipt_ULOG: ulog_send: nothing to send\n");
-               return;
-       }
-
        NETLINK_CB(ub->skb).dst_group = nlgroupnum + 1;
        DEBUGP("ipt_ULOG: throwing %d packets to netlink group %u\n",
                ub->qlen, nlgroupnum + 1);

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 23af261..b59d3b2 100644 (file)
--- 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");