From patchwork Tue Oct 19 00:03:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 68254 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 806D6B70CB for ; Tue, 19 Oct 2010 11:03:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933529Ab0JSADZ (ORCPT ); Mon, 18 Oct 2010 20:03:25 -0400 Received: from mail.vyatta.com ([76.74.103.46]:57574 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932927Ab0JSADY (ORCPT ); Mon, 18 Oct 2010 20:03:24 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 164751828EBF; Mon, 18 Oct 2010 17:03:24 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kYJGCEfA6glE; Mon, 18 Oct 2010 17:03:23 -0700 (PDT) Received: from nehalam (unknown [10.250.0.102]) by mail.vyatta.com (Postfix) with ESMTPSA id 45429182897C; Mon, 18 Oct 2010 17:03:23 -0700 (PDT) Date: Mon, 18 Oct 2010 17:03:21 -0700 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH] bridge: make br_parse_ip_options static Message-ID: <20101018170321.2b0de4ea@nehalam> Organization: Vyatta X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/bridge/br_netfilter.c 2010-10-18 17:01:36.903364885 -0700 +++ b/net/bridge/br_netfilter.c 2010-10-18 17:01:48.106569141 -0700 @@ -213,7 +213,7 @@ static inline void nf_bridge_update_prot * expected format */ -int br_parse_ip_options(struct sk_buff *skb) +static int br_parse_ip_options(struct sk_buff *skb) { struct ip_options *opt; struct iphdr *iph;