diff options
| author | David S. Miller | 2013-02-09 00:02:14 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-02-09 00:02:14 +0100 |
| commit | fd5023111cf720db890ef34f305ac5d427e690a0 (patch) | |
| tree | 4d21e9a02bfbdafe5fc598af0755db791238dbe7 /net/ipv6/ip6_gre.c | |
| parent | cxgb4vf: Fix extraction of cpl_rx_pkt from the response queue descriptor (diff) | |
| parent | Linux 3.8-rc7 (diff) | |
| download | kernel-qcow2-linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.gz kernel-qcow2-linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.xz kernel-qcow2-linux-fd5023111cf720db890ef34f305ac5d427e690a0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index db91fe3466a3..e4efffe2522e 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -958,7 +958,7 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb, int ret; if (!ip6_tnl_xmit_ctl(t)) - return -1; + goto tx_err; switch (skb->protocol) { case htons(ETH_P_IP): |