Commit 35d32e8f authored by John W. Linville's avatar John W. Linville Committed by David S. Miller

geneve: move definition of geneve_hdr() to geneve.h

This is a static inline with identical definitions in multiple places...
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 125907ae
...@@ -62,6 +62,11 @@ struct genevehdr { ...@@ -62,6 +62,11 @@ struct genevehdr {
struct geneve_opt options[]; struct geneve_opt options[];
}; };
static inline struct genevehdr *geneve_hdr(const struct sk_buff *skb)
{
return (struct genevehdr *)(udp_hdr(skb) + 1);
}
#ifdef CONFIG_INET #ifdef CONFIG_INET
struct geneve_sock; struct geneve_sock;
......
...@@ -60,11 +60,6 @@ struct geneve_net { ...@@ -60,11 +60,6 @@ struct geneve_net {
static int geneve_net_id; static int geneve_net_id;
static inline struct genevehdr *geneve_hdr(const struct sk_buff *skb)
{
return (struct genevehdr *)(udp_hdr(skb) + 1);
}
static struct geneve_sock *geneve_find_sock(struct net *net, static struct geneve_sock *geneve_find_sock(struct net *net,
sa_family_t family, __be16 port) sa_family_t family, __be16 port)
{ {
......
...@@ -46,11 +46,6 @@ static inline struct geneve_port *geneve_vport(const struct vport *vport) ...@@ -46,11 +46,6 @@ static inline struct geneve_port *geneve_vport(const struct vport *vport)
return vport_priv(vport); return vport_priv(vport);
} }
static inline struct genevehdr *geneve_hdr(const struct sk_buff *skb)
{
return (struct genevehdr *)(udp_hdr(skb) + 1);
}
/* Convert 64 bit tunnel ID to 24 bit VNI. */ /* Convert 64 bit tunnel ID to 24 bit VNI. */
static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni) static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment