apply quagga patchset to frederic's repo default tip
authorHajime Tazaki <tazaki@nict.go.jp>
Thu, 21 Jun 2012 17:27:24 +0900
changeset 1 ec0aab46d5c1
parent 0 b6aef4711647
apply quagga patchset to frederic's repo
120406-linux-quagga-support.patch
series
--- a/120406-linux-quagga-support.patch	Fri Jun 01 18:02:10 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-diff -r e5505327aee5 Makefile.print
---- a/Makefile.print	Thu Feb 09 13:34:55 2012 +0100
-+++ b/Makefile.print	Sat Apr 07 22:14:57 2012 +0900
-@@ -31,4 +31,4 @@
- 	@echo -n $(addprefix $(objdir),$(@:.o=.ko)); echo -n "="
- 	@echo $(addprefix $(objdir),$(if $($(@:.o=-objs)),$($(@:.o=-objs)),$@))
- $(subdirs):
--	@$(MAKE) -s -f $(firstword $(MAKEFILE_LIST)) objdir=$(objdir)$@ config=$(config) srcdir=$(srcdir)$@ to_keep=$(to_keep) print 2>/dev/null
-+	@$(MAKE) -s -f $(firstword $(MAKEFILE_LIST)) objdir=$(objdir)$@/ config=$(config) srcdir=$(srcdir)$@/ to_keep=$(to_keep) print 2>/dev/null
-diff -r e5505327aee5 processor.mk
---- a/processor.mk	Thu Feb 09 13:34:55 2012 +0100
-+++ b/processor.mk	Sat Apr 07 22:14:57 2012 +0900
-@@ -1,4 +1,4 @@
--PROCESSOR=$(shell uname -p)
-+PROCESSOR=$(shell uname -m)
- PROCESSOR_x86_64=64
- PROCESSOR_i686=32
- PROCESSOR_i586=32
-diff -r e5505327aee5 sim/defconfig
---- a/sim/defconfig	Thu Feb 09 13:34:55 2012 +0100
-+++ b/sim/defconfig	Sat Apr 07 22:14:57 2012 +0900
-@@ -87,7 +87,7 @@
- # CONFIG_DEFAULT_WESTWOOD is not set
- CONFIG_DEFAULT_RENO=y
- CONFIG_DEFAULT_TCP_CONG="reno"
--CONFIG_IPV6=m
-+CONFIG_IPV6=y
- CONFIG_IPV6_PRIVACY=y
- CONFIG_IPV6_ROUTER_PREF=y
- CONFIG_INET6_AH=m
-diff -r e5505327aee5 sim/security.c
---- a/sim/security.c	Thu Feb 09 13:34:55 2012 +0100
-+++ b/sim/security.c	Sat Apr 07 22:14:57 2012 +0900
-@@ -7,7 +7,9 @@
- {
-   switch (cap)
-   {
--    case CAP_NET_RAW: return 1;
-+    case CAP_NET_RAW:
-+    case CAP_NET_BIND_SERVICE:
-+	 return 1;
- 
-     default: break;
-   }
-diff -r e5505327aee5 sim/sim-socket.c
---- a/sim/sim-socket.c	Thu Feb 09 13:34:55 2012 +0100
-+++ b/sim/sim-socket.c	Sat Apr 07 22:14:57 2012 +0900
-@@ -38,7 +38,7 @@
-   size_t size = 0;
-   for (i = 0; i < msg->msg_iovlen; i++)
-     {
--      size += msg->msg_iov->iov_len;
-+      size += msg->msg_iov[i].iov_len;
-     }
-   return size;
- }
-@@ -47,9 +47,13 @@
-   struct socket *kernel_socket = (struct socket *)socket;
-   struct iovec *kernel_iov = copy_iovec (msg->msg_iov, msg->msg_iovlen);
-   struct iovec *user_iov = msg->msg_iov;
-+  struct cmsghdr *user_cmsgh = msg->msg_control;
-+  size_t user_cmsghlen = msg->msg_controllen;
-   msg->msg_iov = kernel_iov;
-   int retval = sock_recvmsg (kernel_socket, msg, iov_size (msg), flags);
-   msg->msg_iov = user_iov;
-+  msg->msg_control = user_cmsgh;
-+  msg->msg_controllen = user_cmsghlen - msg->msg_controllen;
-   sim_free (kernel_iov);
-   return retval;
- }
--- a/series	Fri Jun 01 18:02:10 2012 +0900
+++ b/series	Thu Jun 21 17:27:24 2012 +0900
@@ -1,2 +1,1 @@
-120406-linux-quagga-support.patch
 120410-linux-umip-support.patch