diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-01-02 08:02:06 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-01-02 08:02:06 -0500 |
| commit | 37e2c2a775fc887acd1432908478dfd532f7f00f (patch) | |
| tree | e51ebc699d8e262fd47e0913be6a711cb1a7b565 /include/uapi/linux/if.h | |
| parent | 1c8ddae09f4c102b97c9086cc70347e89468a547 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge commit v3.13-rc1 into kbuild/misc
Diffstat (limited to 'include/uapi/linux/if.h')
| -rw-r--r-- | include/uapi/linux/if.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h index 1ec407b01e46..d758163b0e43 100644 --- a/include/uapi/linux/if.h +++ b/include/uapi/linux/if.h | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | #define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ | 83 | #define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ |
| 84 | #define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address | 84 | #define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address |
| 85 | * change when it's running */ | 85 | * change when it's running */ |
| 86 | #define IFF_MACVLAN 0x200000 /* Macvlan device */ | ||
| 86 | 87 | ||
| 87 | 88 | ||
| 88 | #define IF_GET_IFACE 0x0001 /* for querying only */ | 89 | #define IF_GET_IFACE 0x0001 /* for querying only */ |