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

linvjw · davem330 · commit 35d32e8fe4ab · 2015-05-13T15:59:13.000-04:00
This is a static inline with identical definitions in multiple places...

Signed-off-by: John W. Linville &lt;linville@tuxdriver.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/geneve.h b/include/net/geneve.h
@@ -62,6 +62,11 @@ struct genevehdr {
 	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
 struct geneve_sock;
 
diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
@@ -60,11 +60,6 @@ struct geneve_net {
 
 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,
 					    sa_family_t family, __be16 port)
 {
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c
@@ -46,11 +46,6 @@ static inline struct geneve_port *geneve_vport(const struct vport *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. */
 static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)
 {

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,6 @@ static inline struct geneve_port geneve_vport(const struct vport vport)`
`46`	`46`	`return vport_priv(vport);`
`47`	`47`	`}`
`48`	`48`
`49`		`-static inline struct genevehdr geneve_hdr(const struct sk_buff skb)`
`50`		`-{`
`51`		`- return (struct genevehdr *)(udp_hdr(skb) + 1);`
`52`		`-}`
`53`		`-`
`54`	`49`	`/* Convert 64 bit tunnel ID to 24 bit VNI. */`
`55`	`50`	`static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)`
`56`	`51`	`{`