diff options
Diffstat (limited to 'main/linux-grsec/net-v2-gre-fix-the-inner-mac-header-in-nbma-tunnel-xmit-path.patch')
-rw-r--r-- | main/linux-grsec/net-v2-gre-fix-the-inner-mac-header-in-nbma-tunnel-xmit-path.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/main/linux-grsec/net-v2-gre-fix-the-inner-mac-header-in-nbma-tunnel-xmit-path.patch b/main/linux-grsec/net-v2-gre-fix-the-inner-mac-header-in-nbma-tunnel-xmit-path.patch deleted file mode 100644 index 579ba6dc7e..0000000000 --- a/main/linux-grsec/net-v2-gre-fix-the-inner-mac-header-in-nbma-tunnel-xmit-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c -index 94213c8..b40b90d 100644 ---- a/net/ipv4/ip_gre.c -+++ b/net/ipv4/ip_gre.c -@@ -250,10 +250,6 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, - struct ip_tunnel *tunnel = netdev_priv(dev); - const struct iphdr *tnl_params; - -- skb = gre_handle_offloads(skb, !!(tunnel->parms.o_flags&TUNNEL_CSUM)); -- if (IS_ERR(skb)) -- goto out; -- - if (dev->header_ops) { - /* Need space for new headers */ - if (skb_cow_head(skb, dev->needed_headroom - -@@ -266,6 +262,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, - * to gre header. - */ - skb_pull(skb, tunnel->hlen + sizeof(struct iphdr)); -+ skb_reset_mac_header(skb); - } else { - if (skb_cow_head(skb, dev->needed_headroom)) - goto free_skb; -@@ -273,6 +270,10 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, - tnl_params = &tunnel->parms.iph; - } - -+ skb = gre_handle_offloads(skb, !!(tunnel->parms.o_flags&TUNNEL_CSUM)); -+ if (IS_ERR(skb)) -+ goto out; -+ - __gre_xmit(skb, dev, tnl_params, skb->protocol); - - return NETDEV_TX_OK; |