diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/neighbour.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/linux/neighbour.h')
| -rw-r--r-- | include/linux/neighbour.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h index 8730d5dae1bc..12c9de138451 100644 --- a/include/linux/neighbour.h +++ b/include/linux/neighbour.h | |||
| @@ -31,6 +31,7 @@ enum | |||
| 31 | * Neighbor Cache Entry Flags | 31 | * Neighbor Cache Entry Flags |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #define NTF_USE 0x01 | ||
| 34 | #define NTF_PROXY 0x08 /* == ATF_PUBL */ | 35 | #define NTF_PROXY 0x08 /* == ATF_PUBL */ |
| 35 | #define NTF_ROUTER 0x80 | 36 | #define NTF_ROUTER 0x80 |
| 36 | 37 | ||