diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2012-06-29 15:21:34 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2012-06-29 15:21:34 +0000 |
| commit | 304050dde060facc39178d319b5a71701f01ee54 (patch) | |
| tree | 8fbe06d03fb7d3a8609552c31432b253571524eb /sys/net/if.h | |
| parent | 436f647402d0a2ea86ae8ba392f9f8292ba211ca (diff) | |
| download | src-304050dde060facc39178d319b5a71701f01ee54.tar.gz src-304050dde060facc39178d319b5a71701f01ee54.zip | |
Hold GIF_LOCK() for almost all of gif_start(). It is required to be held
across in_gif_output() and in6_gif_output() anyway, and once it is held
across those it might as well be held for the entire loop. This simplifies
the code and removes the need for the custom IFF_GIF_WANTED flag (which
belonged in the softc and not as an IFF_* flag anyway).
Tested by: Vincent Hoffman vince unsane co uk
Notes
Notes:
svn path=/head/; revision=237787
Diffstat (limited to 'sys/net/if.h')
| -rw-r--r-- | sys/net/if.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index 5b4db00a0f29..d420d26a5ca4 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -153,7 +153,6 @@ struct if_data { #define IFF_STATICARP 0x80000 /* (n) static ARP */ #define IFF_DYING 0x200000 /* (n) interface is winding down */ #define IFF_RENAMING 0x400000 /* (n) interface is being renamed */ -#define IFF_GIF_WANTED 0x1000000 /* (n) The gif tunnel is wanted */ /* * Old names for driver flags so that user space tools can continue to use * the old (portable) names. |