Message ID | 20140115081250.56958f9a@nehalam.linuxnetplumber.net |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
You did miss the "---" after SOB ;) On 1/15/14, Stephen Hemminger <stephen@networkplumber.org> wrote: > This is C not shell script > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > --- a/net/ipv4/netfilter.c 2013-12-31 17:45:31.993942921 -0800 > +++ b/net/ipv4/netfilter.c 2014-01-15 08:10:49.793785943 -0800 > @@ -61,7 +61,7 @@ int ip_route_me_harder(struct sk_buff *s > skb_dst_set(skb, NULL); > dst = xfrm_lookup(net, dst, flowi4_to_flowi(&fl4), skb->sk, 0); > if (IS_ERR(dst)) > - return PTR_ERR(dst);; > + return PTR_ERR(dst); > skb_dst_set(skb, dst); > } > #endif > -- > 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 > -- 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
On Wed, Jan 15, 2014 at 08:12:50AM -0800, Stephen Hemminger wrote:
> This is C not shell script
This one didn't reach in time to the previous merge window.
Now applied, thanks!
--
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/ipv4/netfilter.c 2013-12-31 17:45:31.993942921 -0800 +++ b/net/ipv4/netfilter.c 2014-01-15 08:10:49.793785943 -0800 @@ -61,7 +61,7 @@ int ip_route_me_harder(struct sk_buff *s skb_dst_set(skb, NULL); dst = xfrm_lookup(net, dst, flowi4_to_flowi(&fl4), skb->sk, 0); if (IS_ERR(dst)) - return PTR_ERR(dst);; + return PTR_ERR(dst); skb_dst_set(skb, dst); } #endif
This is C not shell script Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> -- 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