|
@@ -724,11 +724,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
|
|
goto tx_error;
|
|
goto tx_error;
|
|
}
|
|
}
|
|
|
|
|
|
- if (skb->protocol == htons(ETH_P_IP)) {
|
|
|
|
|
|
+ if (skb->protocol == htons(ETH_P_IP))
|
|
rt = skb_rtable(skb);
|
|
rt = skb_rtable(skb);
|
|
- if ((dst = rt->rt_gateway) == 0)
|
|
|
|
- goto tx_error_icmp;
|
|
|
|
- }
|
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
else if (skb->protocol == htons(ETH_P_IPV6)) {
|
|
else if (skb->protocol == htons(ETH_P_IPV6)) {
|
|
struct neighbour *neigh = dst_get_neighbour_noref(skb_dst(skb));
|
|
struct neighbour *neigh = dst_get_neighbour_noref(skb_dst(skb));
|
|
@@ -910,9 +907,10 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
|
|
__IPTUNNEL_XMIT(tstats, &dev->stats);
|
|
__IPTUNNEL_XMIT(tstats, &dev->stats);
|
|
return NETDEV_TX_OK;
|
|
return NETDEV_TX_OK;
|
|
|
|
|
|
|
|
+#if IS_ENABLED(CONFIG_IPV6)
|
|
tx_error_icmp:
|
|
tx_error_icmp:
|
|
dst_link_failure(skb);
|
|
dst_link_failure(skb);
|
|
-
|
|
|
|
|
|
+#endif
|
|
tx_error:
|
|
tx_error:
|
|
dev->stats.tx_errors++;
|
|
dev->stats.tx_errors++;
|
|
dev_kfree_skb(skb);
|
|
dev_kfree_skb(skb);
|