diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-18 10:12:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 10:12:31 +0100 |
| commit | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (patch) | |
| tree | 1c87c8f73dc41fd11ee3dacb1b91a7cc8b4798bb /include/net/ip_tunnels.h | |
| parent | Merge branch 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm into drm-... (diff) | |
| parent | Linux 3.14-rc7 (diff) | |
| download | linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.tar.xz linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.zip | |
Merge tag 'v3.14-rc7' into drm-next
Linux 3.14-rc7
Backmerge to help out Intel guys.
Diffstat (limited to 'include/net/ip_tunnels.h')
| -rw-r--r-- | include/net/ip_tunnels.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 48ed75c21260..e77c10405d51 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -129,6 +129,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], struct ip_tunnel_parm *p); void ip_tunnel_setup(struct net_device *dev, int net_id); +void ip_tunnel_dst_reset_all(struct ip_tunnel *t); /* Extract dsfield from inner protocol */ static inline u8 ip_tunnel_get_dsfield(const struct iphdr *iph, |