On Mon, Sep 30, 2013 at 11:47 PM, Simon Horman <ho...@verge.net.au> wrote: > Allow datapath to recognize and extract MPLS labels into flow keys > and execute actions which push, pop, and set labels on packets. > > Based heavily on work by Leo Alterman, Ravi K, Isaku Yamahata and Joe > Stringer. > > Cc: Ravi K <rke...@gmail.com> > Cc: Leo Alterman <lalter...@nicira.com> > Cc: Isaku Yamahata <yamah...@valinux.co.jp> > Cc: Joe Stringer <j...@wand.net.nz> > Signed-off-by: Simon Horman <ho...@verge.net.au> > > --- > > + > + /* this hack needed to get regular skb_gso_segment() */ > +#ifdef HAVE___SKB_GSO_SEGMENT > +#undef __skb_gso_segment > + skb_gso = __skb_gso_segment(skb, features, tx_path); > +#else > +#undef skb_gso_segment > + skb_gso = skb_gso_segment(skb, features); > +#endif > +
We can get rid of #ifdefs by just using different name for rpl___skb_gso_segment(), something like mpls_vlan_skb_gso_segment(). The way it is done for tnl-gso. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
