diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-14 21:44:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-14 21:44:14 +0200 |
| commit | 87ffabb1f055e14e7d171c6599539a154d647904 (patch) | |
| tree | 56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2 /net/ipv4/fou.c | |
| parent | Merge branch 'cxgb4-next' (diff) | |
| parent | tcp: tcp_make_synack() should clear skb->tstamp (diff) | |
| download | linux-87ffabb1f055e14e7d171c6599539a154d647904.tar.xz linux-87ffabb1f055e14e7d171c6599539a154d647904.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fou.c')
| -rw-r--r-- | net/ipv4/fou.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c index 263710259774..af150b43b214 100644 --- a/net/ipv4/fou.c +++ b/net/ipv4/fou.c @@ -886,12 +886,12 @@ EXPORT_SYMBOL(gue_build_header); #ifdef CONFIG_NET_FOU_IP_TUNNELS -static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = { +static const struct ip_tunnel_encap_ops fou_iptun_ops = { .encap_hlen = fou_encap_hlen, .build_header = fou_build_header, }; -static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = { +static const struct ip_tunnel_encap_ops gue_iptun_ops = { .encap_hlen = gue_encap_hlen, .build_header = gue_build_header, }; |