proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-19 10:21:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into vxlan

Browse Source
This commit is contained in:
Stephen Hemminger 2012-10-01 09:05:29 -07:00
commit d0d9fcb3ce
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/Makefile
View File

@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt
LATEX=latex LATEX=latex
DVIPS=dvips DVIPS=dvips
SGML2DVI=sgml2latex --output=dvi SGML2DVI=sgml2latex
SGML2HTML=sgml2html -s 0 SGML2HTML=sgml2html -s 0
LPR=lpr -Zsduplex LPR=lpr -Zsduplex
SHELL=bash SHELL=bash
@ -31,8 +31,11 @@ pdf: $(PDFFILES)
print: $(PSFILES) print: $(PSFILES)
$(LPR) $(PSFILES) $(LPR) $(PSFILES)
%.tex: %.sgml
$(SGML2DVI) --output=tex $<
%.dvi: %.sgml %.dvi: %.sgml
$(SGML2DVI) $< $(SGML2DVI) --output=dvi $<
%.dvi: %.tex %.dvi: %.tex
@set -e; pass=2; echo "Running LaTeX $<"; \ @set -e; pass=2; echo "Running LaTeX $<"; \
@ -44,10 +47,17 @@ print: $(PSFILES)
echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
done done
#%.pdf: %.tex %.pdf: %.tex
# pdflatex $< @set -e; pass=2; echo "Running pdfLaTeX $<"; \
%.pdf: %.ps while [ `pdflatex $< </dev/null 2>&1 | \
ps2pdf $< 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 %.ps: %.dvi
$(DVIPS) $< -o $@ $(DVIPS) $< -o $@

2
include/SNAPSHOT.h
View File

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

2
include/linux/xfrm.h
View File

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