datapath: Rename skb_network_protocol() to __skb_network_protocol()

The function skb_network_protocol() is already defined in <linux/netdevice.h> upstream but not an exported symbol. Rename the OVS internal implementation to work around this. Signed-off-by: Thomas Graf <[email protected]> Signed-off-by: Jesse Gross <[email protected]>
hugb · Jul 9, 2013 · 47916a6 · 47916a6
1 parent 3fc5378
commit 47916a6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/datapath/linux/compat/gso.c b/datapath/linux/compat/gso.c
@@ -36,7 +36,7 @@
 
 #include "gso.h"
 
-static __be16 skb_network_protocol(struct sk_buff *skb)
+static __be16 __skb_network_protocol(struct sk_buff *skb)
 {
 	__be16 type = skb->protocol;
 	int vlan_depth = ETH_HLEN;
@@ -68,7 +68,7 @@ static struct sk_buff *tnl_skb_gso_segment(struct sk_buff *skb,
 
 	/* setup whole inner packet to get protocol. */
 	__skb_pull(skb, mac_offset);
-	skb->protocol = skb_network_protocol(skb);
+	skb->protocol = __skb_network_protocol(skb);
 
 	/* setup l3 packet to gso, to get around segmentation bug on older kernel.*/
 	__skb_pull(skb, (pkt_hlen - mac_offset));