[mpls-linux-devel] ok to apply mpls patch on recent kernel: 2.6.16.18?

[Bob B. <bob...@gm...>]

Hello James,

I noticed in linux 2.6.16.x, TIPC has taken your socket!

see include/linux/socket.h:

#define AF_WANPIPE	25	/* Wanpipe API Sockets */
#define AF_LLC		26	/* Linux LLC			*/
#define AF_TIPC		30	/* TIPC sockets			*/
#define AF_BLUETOOTH	31	/* Bluetooth sockets 		*/
#define AF_MAX		32	/* For now.. */

I was able to use 29, and with 4 other small fix-ups in:
 net/ipv4/Makefile, net/ipv4/netfilter/Kconfig,
 net/ipv4/netfilter/Makefile, and net/ipv6/netfilter/Makefile
 I was able to apply kernel patch to 2.6.16.18, with only
 one fuzz, and about 12 offsets.

I see netfilter has been modified a bit,
 (some of the targets have moved,
  e.g.: now CONFIG_NETFILTER_XT_TARGET_CLASSIFY
          was CONFIG_IP_NF_TARGET_CLASSIFY).

Is mpls 1.950 still expected to work with 2.6.16.x?




I get these warnings/errors when compiling kernel (gcc 3.4.4):
 (but can compile after making included, suggested fixes below)
...
  CC [M]  net/ipv4/netfilter/ipt_mpls.o
net/ipv4/netfilter/ipt_mpls.c:76: warning: initialization from
incompatible pointer type
+++++++++++
maybe needs: ".checkentry     = &checkentry,"
and change in checkentry function args:
-	   const struct ipt_entry *e,
+	  const void *e,


  CC [M]  net/ipv6/netfilter/ip6t_mpls.o
net/ipv6/netfilter/ip6t_mpls.c:74: warning: initialization from
incompatible pointer type
+++++++++++
maybe needs: ".checkentry     = &checkentry,"


 CC [M]  net/mpls/mpls_input.o
net/mpls/mpls_input.c: In function `mpls_skb_recv':
net/mpls/mpls_input.c:255: error: `ARPHRD_ETHER' undeclared (first use
in this function)
net/mpls/mpls_input.c:255: error: (Each undeclared identifier is
reported only once
net/mpls/mpls_input.c:255: error: for each function it appears in.)
net/mpls/mpls_input.c:256: error: `ARPHRD_FDDI' undeclared (first use
in this function)
net/mpls/mpls_input.c:257: error: `ARPHRD_IEEE802' undeclared (first
use in this function)
net/mpls/mpls_input.c:258: error: `ARPHRD_PPP' undeclared (first use
in this function)
net/mpls/mpls_input.c:259: error: `ARPHRD_LOOPBACK' undeclared (first
use in this function)
net/mpls/mpls_input.c:260: error: `ARPHRD_HDLC' undeclared (first use
in this function)
net/mpls/mpls_input.c:261: error: `ARPHRD_IPGRE' undeclared (first use
in this function)
+++++++++++
maybe needs "#include <linux/if_arp.h>"

  CC [M]  net/mpls/mpls_netlink.o
net/mpls/mpls_netlink.c:39: error: unknown field `owner' specified in
initializer
net/mpls/mpls_netlink.c:39: warning: initialization from incompatible
pointer type
+++++++++++
maybe needs to remove " .owner = THIS_MODULE,"



-Bob