Merge branch 'for-4.2-misc' into k.o/for-4.2

2015-06-02 09:33:22 -04:00
parent 73cdaaeed1 1156256811
commit b806ef3bbe
10 changed files with 47 additions and 18 deletions
--- a/include/rdma/iw_cm.h
+++ b/include/rdma/iw_cm.h
@@ -91,6 +91,7 @@ struct iw_cm_id {
 	/* Used by provider to add and remove refs on IW cm_id */
 	void (*add_ref)(struct iw_cm_id *);
 	void (*rem_ref)(struct iw_cm_id *);
+	u8  tos;
 };

 struct iw_cm_conn_param {