From 6bd8d583bd8492bafed4762cdb2109bf03e37960 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Mon, 22 Apr 2013 20:45:42 +0000 Subject: [PATCH] --- yaml --- r: 369751 b: refs/heads/master c: 2bac7cb316d1327c457a715bac5fd56bbc42bc63 h: refs/heads/master i: 369749: dc99f8255805c91c8cbb185bcdc568e2174ac61e 369747: 4557b36681e0a54d446a11d9445e8eec8c186f65 369743: 4e8320e6b3a5b7f4cd0beb336bebd8b0a91e8fdd v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_gre.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 921edfcef0ff..2d64f764ef45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0eb43b4bb081a1a22574daab9c05286a600dd7fe +refs/heads/master: 2bac7cb316d1327c457a715bac5fd56bbc42bc63 diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c index 987a4e5e07e2..c625e4dad4b0 100644 --- a/trunk/net/ipv4/ip_gre.c +++ b/trunk/net/ipv4/ip_gre.c @@ -444,7 +444,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, if (dev->header_ops) { /* Need space for new headers */ if (skb_cow_head(skb, dev->needed_headroom - - (tunnel->hlen + sizeof(struct iphdr)))); + (tunnel->hlen + sizeof(struct iphdr)))) goto free_skb; tnl_params = (const struct iphdr *)skb->data;