On Wed, 30 Sep 2015 14:34:05 -0400, John W. Linville wrote:

+#if IS_ENABLED(CONFIG_IPV6)
+static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
+				    struct ip_tunnel_info *info)
+{
+	struct geneve_dev *geneve = netdev_priv(dev);
+	struct geneve_sock *gs6 = geneve->sock6;
+	struct dst_entry *dst = NULL;
+	struct flowi6 fl6;
+	__u8 ttl;
+	__be16 sport;
+	bool udp_csum;
+	int err;
+	bool xnet = !net_eq(geneve->net, dev_net(geneve->dev));
+
+	if (geneve->collect_md) {
+		if (unlikely(info && info->mode != IP_TUNNEL_INFO_TX)) {

Should be !(info->mode & IP_TUNNEL_INFO_TX).

The rest looks good to me.

 Jiri

-- 
Jiri Benc