diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-09-04 20:12:36 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-09-04 20:12:36 +0000 |
| commit | ec8cd58eaa7dce1497f70cbccb426548688b297a (patch) | |
| tree | 23b0dc5ba6b006f74b06a4bc47467cfeb326038f /sys/ofed/include/linux/if_vlan.h | |
| parent | 0475b83655c10a4792a79a97799741c84500ad44 (diff) | |
| download | FreeBSD-src-ec8cd58eaa7dce1497f70cbccb426548688b297a.zip FreeBSD-src-ec8cd58eaa7dce1497f70cbccb426548688b297a.tar.gz | |
MFC r270710 and r270821:
- Update the OFED Linux Emulation layer as a preparation for a
hardware driver update from Mellanox Technologies.
- Remove empty files from the OFED Linux Emulation layer.
- Fix compile warnings related to printf() and the "%lld" and "%llx"
format specifiers.
- Add some missing 2-clause BSD copyrights.
- Add "Mellanox Technologies, Ltd." to list of copyright holders.
- Add some new compatibility files.
- Fix order of uninit in the mlx4ib module to avoid crash at unload
using the new module_exit_order() function.
Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/ofed/include/linux/if_vlan.h')
| -rw-r--r-- | sys/ofed/include/linux/if_vlan.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/ofed/include/linux/if_vlan.h b/sys/ofed/include/linux/if_vlan.h index bb7eee0..8b0cd29 100644 --- a/sys/ofed/include/linux/if_vlan.h +++ b/sys/ofed/include/linux/if_vlan.h @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +30,11 @@ #ifndef _LINUX_IF_VLAN_H_ #define _LINUX_IF_VLAN_H_ +#include <sys/socket.h> +#include <net/if.h> #include <net/ethernet.h> #include <net/if_vlan_var.h> +#define VLAN_N_VID 4096 + #endif /* _LINUX_IF_VLAN_H_ */ |
