From: Jesse Gross Date: Wed, 24 Nov 2010 06:35:15 +0000 (-0800) Subject: datapath: Add compatibility code for inet_add_protocol(). X-Git-Tag: v1.1.0~772 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=84a2398d1634ffe671d4a6511676802b762d6cd3;p=sliver-openvswitch.git datapath: Add compatibility code for inet_add_protocol(). Kernels earlier than 2.6.32 did not mark struct net_protocol as const in inet_add_protcol() and inet_del_protocol(). This provides compatibility code to cast away the constness on these kernels so we can have them be const on newer kernels. Signed-off-by: Jesse Gross Acked-by: Ben Pfaff --- diff --git a/datapath/linux-2.6/Modules.mk b/datapath/linux-2.6/Modules.mk index 380f1c15a..e1e33347b 100644 --- a/datapath/linux-2.6/Modules.mk +++ b/datapath/linux-2.6/Modules.mk @@ -48,6 +48,7 @@ openvswitch_headers += \ linux-2.6/compat-2.6/include/net/genetlink.h \ linux-2.6/compat-2.6/include/net/ip.h \ linux-2.6/compat-2.6/include/net/netlink.h \ + linux-2.6/compat-2.6/include/net/protocol.h \ linux-2.6/compat-2.6/include/net/route.h both_modules += brcompat diff --git a/datapath/linux-2.6/compat-2.6/include/net/protocol.h b/datapath/linux-2.6/compat-2.6/include/net/protocol.h new file mode 100644 index 000000000..6ffe0cb0b --- /dev/null +++ b/datapath/linux-2.6/compat-2.6/include/net/protocol.h @@ -0,0 +1,12 @@ +#ifndef __NET_PROTOCOL_WRAPPER_H +#define __NET_PROTOCOL_WRAPPER_H 1 + +#include_next + +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) +#define inet_add_protocol(prot, num) inet_add_protocol((struct net_protocol *)(prot), num) +#define inet_del_protocol(prot, num) inet_del_protocol((struct net_protocol *)(prot), num) +#endif + +#endif