From patchwork Wed Sep 30 21:25:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 524619 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5643E140D6A for ; Thu, 1 Oct 2015 07:35:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754993AbbI3VfA (ORCPT ); Wed, 30 Sep 2015 17:35:00 -0400 Received: from out03.mta.xmission.com ([166.70.13.233]:45888 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932834AbbI3VeX (ORCPT ); Wed, 30 Sep 2015 17:34:23 -0400 Received: from in02.mta.xmission.com ([166.70.13.52]) by out03.mta.xmission.com with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ZhP15-000790-6C; Wed, 30 Sep 2015 15:34:23 -0600 Received: from 67-3-201-231.omah.qwest.net ([67.3.201.231] helo=x220.int.ebiederm.org) by in02.mta.xmission.com with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1ZhP14-0006Nq-Nb; Wed, 30 Sep 2015 15:34:23 -0600 From: "Eric W. Biederman" To: David Miller Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, , Nicolas Dichtel Date: Wed, 30 Sep 2015 16:25:35 -0500 Message-Id: <1443648336-31741-5-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <877fn7eh2f.fsf_-_@x220.int.ebiederm.org> References: <877fn7eh2f.fsf_-_@x220.int.ebiederm.org> X-XM-AID: U2FsdGVkX1/LKYZSewcjTag7S/Q+OmoAdQTF67cdvY8= X-SA-Exim-Connect-IP: 67.3.201.231 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sa07.xmission.com X-Spam-Level: * X-Spam-Status: No, score=1.3 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE, TVD_RCVD_IP, T_TooManySym_01, T_TooManySym_02, XMGappySubj_01, XMGappySubj_02 autolearn=disabled version=3.4.0 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 1.0 XMGappySubj_02 Gappier still * 0.5 XMGappySubj_01 Very gappy subject * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4983] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa07 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject * 0.0 T_TooManySym_02 5+ unique symbols in subject X-Spam-DCC: XMission; sa07 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: *;David Miller X-Spam-Relay-Country: X-Spam-Timing: total 149 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 3.4 (2.3%), b_tie_ro: 2.4 (1.6%), parse: 0.57 (0.4%), extract_message_metadata: 10 (6.9%), get_uri_detail_list: 0.65 (0.4%), tests_pri_-1000: 5 (3.6%), tests_pri_-950: 1.24 (0.8%), tests_pri_-900: 1.06 (0.7%), tests_pri_-400: 14 (9.4%), check_bayes: 13 (8.7%), b_tokenize: 3.5 (2.4%), b_tok_get_all: 3.8 (2.6%), b_comp_prob: 1.12 (0.8%), b_tok_touch_all: 2.4 (1.6%), b_finish: 0.67 (0.5%), tests_pri_0: 106 (71.4%), tests_pri_500: 4.2 (2.8%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH net-next 5/6] bridge: Remove br_nf_push_frag_xmit_sk X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that this compatability function no longer has any callers remove it. Signed-off-by: "Eric W. Biederman" --- net/bridge/br_netfilter_hooks.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c index 815994d5b02d..370aa4d4cf4d 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c @@ -691,11 +691,6 @@ static int br_nf_push_frag_xmit(struct net *net, struct sock *sk, struct sk_buff nf_bridge_info_free(skb); return br_dev_queue_push_xmit(net, sk, skb); } -static int br_nf_push_frag_xmit_sk(struct sock *sk, struct sk_buff *skb) -{ - struct net *net = dev_net(skb_dst(skb)->dev); - return br_nf_push_frag_xmit(net, sk, skb); -} #endif #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)