From 47916a6442392a93a0212e8e817953339fbf5f21 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 9 Jul 2013 18:00:25 +0200 Subject: [PATCH] datapath: Rename skb_network_protocol() to __skb_network_protocol() The function skb_network_protocol() is already defined in upstream but not an exported symbol. Rename the OVS internal implementation to work around this. Signed-off-by: Thomas Graf Signed-off-by: Jesse Gross --- datapath/linux/compat/gso.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/linux/compat/gso.c b/datapath/linux/compat/gso.c index 3cadde95a..43418d399 100644 --- 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)); -- 2.43.0