diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-08 18:02:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-08 18:02:14 -0500 |
| commit | fd5023111cf720db890ef34f305ac5d427e690a0 (patch) | |
| tree | 4d21e9a02bfbdafe5fc598af0755db791238dbe7 /net/ipv6/ip6_gre.c | |
| parent | 8b9a4d56866e0dca6ae886ed9bff777e50d0b70c (diff) | |
| parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff) | |
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, | |||
| 958 | int ret; | 958 | int ret; |
| 959 | 959 | ||
| 960 | if (!ip6_tnl_xmit_ctl(t)) | 960 | if (!ip6_tnl_xmit_ctl(t)) |
| 961 | return -1; | 961 | goto tx_err; |
| 962 | 962 | ||
| 963 | switch (skb->protocol) { | 963 | switch (skb->protocol) { |
| 964 | case htons(ETH_P_IP): | 964 | case htons(ETH_P_IP): |