diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:32 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:55 +0200 |
commit | 753d179ad001b25425beb977d00f2531540e7d42 (patch) | |
tree | de61b9e3c86b71e9a654cea002b188f90b1f8ef6 /include/net/ip_tunnels.h | |
parent | 503c1fb98ba3859c13863957c7c65c92371a9e50 (diff) | |
parent | cc71b7b071192ac1c288e272fdc3f3877eb96663 (diff) |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/ip_tunnels.h')
-rw-r--r-- | include/net/ip_tunnels.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 992652856fe8..b41a1e057fce 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -258,7 +258,8 @@ int ip_tunnel_get_iflink(const struct net_device *dev); int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id, struct rtnl_link_ops *ops, char *devname); -void ip_tunnel_delete_net(struct ip_tunnel_net *itn, struct rtnl_link_ops *ops); +void ip_tunnel_delete_nets(struct list_head *list_net, unsigned int id, + struct rtnl_link_ops *ops); void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, const struct iphdr *tnl_params, const u8 protocol); |