Merge branch 'master' into vxlan

doc/Makefile

@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt
 
 LATEX=latex
 DVIPS=dvips
-SGML2DVI=sgml2latex --output=dvi
+SGML2DVI=sgml2latex
 SGML2HTML=sgml2html -s 0
 LPR=lpr -Zsduplex
 SHELL=bash
@@ -31,8 +31,11 @@ pdf: $(PDFFILES)
 print: $(PSFILES)
 	$(LPR) $(PSFILES)
 
+%.tex: %.sgml
+	$(SGML2DVI) --output=tex $<
+
 %.dvi: %.sgml
-	$(SGML2DVI) $<
+	$(SGML2DVI) --output=dvi $<
 
 %.dvi: %.tex
 	@set -e; pass=2; echo "Running LaTeX $<"; \
@@ -44,10 +47,17 @@ print: $(PSFILES)
 		echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
 	done
 
-#%.pdf: %.tex
-#	pdflatex $<
-%.pdf: %.ps
-	ps2pdf $<
+%.pdf: %.tex
+	@set -e; pass=2; echo "Running pdfLaTeX $<"; \
+	while [ `pdflatex $< </dev/null 2>&1 | \
+		 grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \
+		if [ $$pass -gt 3 ]; then \
+			echo "Seems, something is wrong. Try by hands." ; exit 1 ; \
+		fi; \
+		echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
+	done
+#%.pdf: %.ps
+#	ps2pdf $<
 
 %.ps: %.dvi
 	$(DVIPS) $< -o $@

include/SNAPSHOT.h

@@ -1 +1 @@
-static const char SNAPSHOT[] = "120801";
+static const char SNAPSHOT[] = "121001";

include/linux/xfrm.h

@@ -84,6 +84,8 @@ struct xfrm_replay_state {
 	__u32	bitmap;
 };
 
+#define XFRMA_REPLAY_ESN_MAX	4096
+
 struct xfrm_replay_state_esn {
 	unsigned int	bmp_len;
 	__u32		oseq;