From 8b87ba2f1db9a0d1762fa072d6d9f5feebbc5c58 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 5 Jan 2006 12:18:44 -0800 Subject: [PATCH] --- yaml --- r: 16230 b: refs/heads/master c: 205d67c7d942c057648148fefb17e46f77e3efd6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_netlink.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 64e2dbff7544..24ae8d0c0232 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4d6bb41e09f07668ca2655da707eab936e8e8f0 +refs/heads/master: 205d67c7d942c057648148fefb17e46f77e3efd6 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c index df04ad873cc2..703f2d2e3464 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c @@ -1203,7 +1203,6 @@ static int ctnetlink_expect_event(struct notifier_block *this, unsigned int type; unsigned char *b; int flags = 0; - u16 proto; if (events & IPEXP_NEW) { type = IPCTNL_MSG_EXP_NEW; @@ -1230,7 +1229,6 @@ static int ctnetlink_expect_event(struct notifier_block *this, goto nfattr_failure; nlh->nlmsg_len = skb->tail - b; - proto = exp->tuple.dst.protonum; nfnetlink_send(skb, 0, NFNLGRP_CONNTRACK_EXP_NEW, 0); return NOTIFY_DONE;