[Cake] Cake doesn't build against net-next

[Toke Høiland-Jørgensen]

$ make KERNEL_VERSION=4.1.0-v4.1-12265-g14fe22e+
make -C /lib/modules/4.1.0-v4.1-12265-g14fe22e+/build SUBDIRS=/home/alrua/sch_cake modules
make[1]: Entering directory `/home/alrua/net-next'
  CC [M]  /home/alrua/sch_cake/sch_cake.o
/home/alrua/sch_cake/sch_cake.c:53:27: fatal error: net/flow_keys.h: No such file or directory
compilation terminated.
make[2]: *** [/home/alrua/sch_cake/sch_cake.o] Error 1
make[1]: *** [_module_/home/alrua/sch_cake] Error 2
make[1]: Leaving directory `/home/alrua/net-next'
make: *** [default] Error 2

$ find ../net-next/ -name flow_keys.h

$ grep  -R 'struct flow_keys' ../net-next/include/
../net-next/include/linux/skbuff.h:	struct flow_keys keys;
../net-next/include/net/flow_dissector.h:struct flow_keys {
../net-next/include/net/flow_dissector.h:	offsetof(struct flow_keys, FLOW_KEYS_HASH_START_FIELD)
../net-next/include/net/flow_dissector.h:__be32 flow_get_u32_src(const struct flow_keys *flow);
../net-next/include/net/flow_dissector.h:__be32 flow_get_u32_dst(const struct flow_keys *flow);
../net-next/include/net/flow_dissector.h:					      struct flow_keys *flow)
../net-next/include/net/flow_dissector.h:static inline bool skb_flow_dissect_flow_keys_buf(struct flow_keys *flow,
../net-next/include/net/flow_dissector.h:u32 flow_hash_from_keys(struct flow_keys *keys);
../net-next/include/net/flow_dissector.h:		   const struct flow_keys *keys, int hlen);
../net-next/include/net/flow_dissector.h:/* struct flow_keys_digest:
../net-next/include/net/flow_dissector.h:struct flow_keys_digest {
../net-next/include/net/flow_dissector.h:void make_flow_keys_digest(struct flow_keys_digest *digest,
../net-next/include/net/flow_dissector.h:			   const struct flow_keys *flow);
../net-next/include/net/ipv6.h:static inline void iph_to_flow_copy_v6addrs(struct flow_keys *flow,
../net-next/include/net/ipv6.h:	struct flow_keys keys;
../net-next/include/net/ip.h:static inline void iph_to_flow_copy_v4addrs(struct flow_keys *flow,
../net-next/include/net/ip.h:	struct flow_keys keys;


Including flow_dissector.h instead doesn't work either:

$ make KERNEL_VERSION=4.1.0-v4.1-12265-g14fe22e+
make -C /lib/modules/4.1.0-v4.1-12265-g14fe22e+/build SUBDIRS=/home/alrua/sch_cake modules
make[1]: Entering directory `/home/alrua/net-next'
  CC [M]  /home/alrua/sch_cake/sch_cake.o
/home/alrua/sch_cake/sch_cake.c: In function ‘cake_fqcd_hash’:
/home/alrua/sch_cake/sch_cake.c:214:2: warning: passing argument 2 of ‘skb_flow_dissect’ from incompatible pointer type [enabled by default]
In file included from include/linux/skbuff.h:37:0,
                 from /home/alrua/sch_cake/sch_cake.c:46:
include/net/flow_dissector.h:146:60: note: expected ‘struct flow_dissector *’ but argument is of type ‘struct flow_keys *’
/home/alrua/sch_cake/sch_cake.c:214:2: error: too few arguments to function ‘skb_flow_dissect’
In file included from include/linux/skbuff.h:37:0,
                 from /home/alrua/sch_cake/sch_cake.c:46:
include/net/flow_dissector.h:146:60: note: declared here
/home/alrua/sch_cake/sch_cake.c:217:7: error: ‘struct flow_keys’ has no member named ‘ip_proto’
/home/alrua/sch_cake/sch_cake.c:218:14: error: incompatible types when assigning to type ‘struct flow_dissector_key_ports’ from type ‘int’
/home/alrua/sch_cake/sch_cake.c:221:8: error: ‘struct flow_keys’ has no member named ‘src’
/home/alrua/sch_cake/sch_cake.c:224:8: error: ‘struct flow_keys’ has no member named ‘dst’
/home/alrua/sch_cake/sch_cake.c:227:32: error: ‘struct flow_keys’ has no member named ‘dst’
/home/alrua/sch_cake/sch_cake.c:228:17: error: ‘struct flow_keys’ has no member named ‘src’
/home/alrua/sch_cake/sch_cake.c:228:28: error: ‘struct flow_keys’ has no member named ‘ip_proto’
/home/alrua/sch_cake/sch_cake.c:229:7: error: aggregate value used where an integer was expected
/home/alrua/sch_cake/sch_cake.c: In function ‘cake_enqueue’:
/home/alrua/sch_cake/sch_cake.c:430:126: warning: comparison of distinct pointer types lacks a cast [enabled by default]
make[2]: *** [/home/alrua/sch_cake/sch_cake.o] Error 1
make[1]: *** [_module_/home/alrua/sch_cake] Error 2
make[1]: Leaving directory `/home/alrua/net-next'
make: *** [default] Error 2

-Toke