projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm+acpi-3.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[cascardo/linux.git]
/
include
/
rdma
/
ib_sa.h
diff --git
a/include/rdma/ib_sa.h
b/include/rdma/ib_sa.h
index
125f871
..
7e071a6
100644
(file)
--- a/
include/rdma/ib_sa.h
+++ b/
include/rdma/ib_sa.h
@@
-154,6
+154,9
@@
struct ib_sa_path_rec {
u8 packet_life_time_selector;
u8 packet_life_time;
u8 preference;
u8 packet_life_time_selector;
u8 packet_life_time;
u8 preference;
+ u8 smac[ETH_ALEN];
+ u8 dmac[ETH_ALEN];
+ u16 vlan_id;
};
#define IB_SA_MCMEMBER_REC_MGID IB_SA_COMP_MASK( 0)
};
#define IB_SA_MCMEMBER_REC_MGID IB_SA_COMP_MASK( 0)