| Message ID | 1572561964-11244-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ip_gre: Remove even more unused code | expand |
On Thu, Oct 31, 2019 at 03:46:04PM -0700, Greg Rose wrote: > There is a confusing mix of ipgre and gretap functions with some > needed for gretap still having ipgre_ prefixes. This time though > I think I got the rest of the unused ipgre code. > > Fixes: d5822f428814 ("gre: Remove dead ipgre code") > Signed-off-by: Greg Rose <gvrose8192@gmail.com> Applied to master, thanks!
On 31.10.2019 23:46, Greg Rose wrote: > There is a confusing mix of ipgre and gretap functions with some > needed for gretap still having ipgre_ prefixes. This time though > I think I got the rest of the unused ipgre code. > > Fixes: d5822f428814 ("gre: Remove dead ipgre code") > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > datapath/linux/compat/ip_gre.c | 38 -------------------------------------- > 1 file changed, 38 deletions(-) Hi. This broke build with kernel 4.15.18: https://travis-ci.org/openvswitch/ovs/jobs/605766364 datapath/linux/ip_gre.c: In function ‘ipgre_tunnel_init’: datapath/linux/ip_gre.c:940:22: error: ‘ipgre_header_ops’ undeclared (first use in this function) dev->header_ops = &ipgre_header_ops; ^ datapath/linux/ip_gre.c:940:22: note: each undeclared identifier is reported only once for each function it appears in datapath/linux/ip_gre.c: At top level: datapath/linux/ip_gre.c:925:12: warning: ‘ipgre_tunnel_init’ defined but not used [-Wunused-function] static int ipgre_tunnel_init(struct net_device *dev) ^ datapath/linux/ip_gre.c:946:20: warning: ‘ipgre_xmit’ defined but not used [-Wunused-function] static netdev_tx_t ipgre_xmit(struct sk_buff *skb, ^ Best regards, Ilya Maximets.
On 11/1/2019 1:27 AM, Ilya Maximets wrote: > On 31.10.2019 23:46, Greg Rose wrote: >> There is a confusing mix of ipgre and gretap functions with some >> needed for gretap still having ipgre_ prefixes. This time though >> I think I got the rest of the unused ipgre code. >> >> Fixes: d5822f428814 ("gre: Remove dead ipgre code") >> Signed-off-by: Greg Rose <gvrose8192@gmail.com> >> --- >> datapath/linux/compat/ip_gre.c | 38 >> -------------------------------------- >> 1 file changed, 38 deletions(-) > > Hi. > > This broke build with kernel 4.15.18: > https://travis-ci.org/openvswitch/ovs/jobs/605766364 > > datapath/linux/ip_gre.c: In function ‘ipgre_tunnel_init’: > datapath/linux/ip_gre.c:940:22: error: ‘ipgre_header_ops’ undeclared > (first use in this function) > dev->header_ops = &ipgre_header_ops; > ^ > datapath/linux/ip_gre.c:940:22: note: each undeclared identifier is > reported only once for each function it appears in > datapath/linux/ip_gre.c: At top level: > datapath/linux/ip_gre.c:925:12: warning: ‘ipgre_tunnel_init’ defined > but not used [-Wunused-function] > static int ipgre_tunnel_init(struct net_device *dev) > ^ > datapath/linux/ip_gre.c:946:20: warning: ‘ipgre_xmit’ defined but not > used [-Wunused-function] > static netdev_tx_t ipgre_xmit(struct sk_buff *skb, > ^ > > Best regards, Ilya Maximets. Thanks Ilya, I'm working on fixing it. I must have pushed a 'between' patch in my own travis test. - Greg
diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 3b7e607..8536241 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -922,44 +922,6 @@ static int erspan_tunnel_init(struct net_device *dev) return ip_tunnel_init(dev); } -static int ipgre_header(struct sk_buff *skb, struct net_device *dev, - unsigned short type, - const void *daddr, const void *saddr, unsigned int len) -{ - struct ip_tunnel *t = netdev_priv(dev); - struct iphdr *iph; - struct gre_base_hdr *greh; - - iph = (struct iphdr *)__skb_push(skb, t->hlen + sizeof(*iph)); - greh = (struct gre_base_hdr *)(iph+1); - greh->flags = gre_tnl_flags_to_gre_flags(t->parms.o_flags); - greh->protocol = htons(type); - - memcpy(iph, &t->parms.iph, sizeof(struct iphdr)); - - /* Set the source hardware address. */ - if (saddr) - memcpy(&iph->saddr, saddr, 4); - if (daddr) - memcpy(&iph->daddr, daddr, 4); - if (iph->daddr) - return t->hlen + sizeof(*iph); - - return -(t->hlen + sizeof(*iph)); -} - -static int ipgre_header_parse(const struct sk_buff *skb, unsigned char *haddr) -{ - const struct iphdr *iph = (const struct iphdr *) skb_mac_header(skb); - memcpy(haddr, &iph->saddr, 4); - return 4; -} - -static const struct header_ops ipgre_header_ops = { - .create = ipgre_header, - .parse = ipgre_header_parse, -}; - static int ipgre_tunnel_init(struct net_device *dev) { struct ip_tunnel *tunnel = netdev_priv(dev);
There is a confusing mix of ipgre and gretap functions with some needed for gretap still having ipgre_ prefixes. This time though I think I got the rest of the unused ipgre code. Fixes: d5822f428814 ("gre: Remove dead ipgre code") Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- datapath/linux/compat/ip_gre.c | 38 -------------------------------------- 1 file changed, 38 deletions(-)