Message ID | 20101018170321.2b0de4ea@nehalam |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 0, Stephen Hemminger <shemminger@vyatta.com> wrote: > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> > > --- 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; > My main motivation behind not making this static was that there would be possibly other places in the bridge code (besides br_netfilter.c) where we enter the IP stack and might want to call this. Not sure if it's indeed the case though..
On Tue, 19 Oct 2010 07:22:34 -0400 Bandan Das <bandan.das@stratus.com> wrote: > On 0, Stephen Hemminger <shemminger@vyatta.com> wrote: > > > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> > > > > --- 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; > > > > My main motivation behind not making this static was that > there would be possibly other places in the bridge code > (besides br_netfilter.c) where we enter the IP stack and might > want to call this. Not sure if it's indeed the case though.. > I checked by doing make allmodconfig as well as looking by git grep 'br_parse_ip_options'
> > > > My main motivation behind not making this static was that > > there would be possibly other places in the bridge code > > (besides br_netfilter.c) where we enter the IP stack and might > > want to call this. Not sure if it's indeed the case though.. > > > > I checked by doing make allmodconfig as well as looking by > git grep 'br_parse_ip_options' > > -- Sorry, my wording was misleading :) What I meant was at this time, it's only used in br_netfilter.c but may be sometime in the future, it could possible be used in some other places where we enter the IP stack from the bridge code. But, I completely agree with you. It makes more sense to make it static as of now. Bandan -- 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
From: Bandan Das <bandan.das@stratus.com> Date: Tue, 19 Oct 2010 07:22:34 -0400 > On 0, Stephen Hemminger <shemminger@vyatta.com> wrote: >> >> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> >> >> --- 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; >> > > My main motivation behind not making this static was that > there would be possibly other places in the bridge code > (besides br_netfilter.c) where we enter the IP stack and might > want to call this. Not sure if it's indeed the case though.. You can un-static it when the use is added. Patch applied, thanks Stephen. -- 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;
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> -- 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