diff options
| author | NeilBrown <neilb@suse.de> | 2010-08-09 20:02:33 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-08-09 20:02:33 -0400 |
| commit | fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch) | |
| tree | 311567d03758afc3a93b4273fe172836e89bb01d /include/linux/if.h | |
| parent | 6e17b0276452912cb13445e5ea552b599984675f (diff) | |
| parent | 2144381da478cc4aa3a29ee29b0c5e6ddaaced14 (diff) | |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'include/linux/if.h')
| -rw-r--r-- | include/linux/if.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index be350e62a905..53558ec59e1b 100644 --- a/include/linux/if.h +++ b/include/linux/if.h | |||
| @@ -73,6 +73,8 @@ | |||
| 73 | #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ | 73 | #define IFF_DONT_BRIDGE 0x800 /* disallow bridging this ether dev */ |
| 74 | #define IFF_IN_NETPOLL 0x1000 /* whether we are processing netpoll */ | 74 | #define IFF_IN_NETPOLL 0x1000 /* whether we are processing netpoll */ |
| 75 | #define IFF_DISABLE_NETPOLL 0x2000 /* disable netpoll at run-time */ | 75 | #define IFF_DISABLE_NETPOLL 0x2000 /* disable netpoll at run-time */ |
| 76 | #define IFF_MACVLAN_PORT 0x4000 /* device used as macvlan port */ | ||
| 77 | #define IFF_BRIDGE_PORT 0x8000 /* device used as bridge port */ | ||
| 76 | 78 | ||
| 77 | #define IF_GET_IFACE 0x0001 /* for querying only */ | 79 | #define IF_GET_IFACE 0x0001 /* for querying only */ |
| 78 | #define IF_GET_PROTO 0x0002 | 80 | #define IF_GET_PROTO 0x0002 |