> -----Original Message----- > From: netdev-ow...@vger.kernel.org [mailto:netdev-ow...@vger.kernel.org] > On Behalf Of Joseph Gasparakis > Sent: Monday, November 12, 2012 5:04 AM > To: da...@davemloft.net; shemmin...@vyatta.com; chr...@sous-sol.org > Cc: Joseph Gasparakis; net...@vger.kernel.org; linux-kernel@vger.kernel.org; > Peter P Waskiewicz Jr > Subject: [PATCH v2 3/3] ipgre: capture inner headers during encapsulation > > Populating the inner header pointers of skb for ipgre > This patch has been compile-tested only. > > v2 Makes sure that checksumming does not take place if the offload flag is > set in > the skb's netdev features > > Signed-off-by: Joseph Gasparakis <joseph.gaspara...@intel.com> > Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz...@intel.com> > --- > net/ipv4/ip_gre.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c > index 7240f8e..e35ed52 100644 > --- a/net/ipv4/ip_gre.c > +++ b/net/ipv4/ip_gre.c > @@ -766,8 +766,10 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff > *skb, struct net_device *dev > int gre_hlen; > __be32 dst; > int mtu; > + unsigned int offset; > > - if (skb->ip_summed == CHECKSUM_PARTIAL && > + if (!(skb->dev->features & NETIF_F_HW_CSUM_ENC_BIT) &&
You should test for NETIF_F_HW_CSUM_ENC and not for NETIF_F_HW_CSUM_ENC_BIT -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
