diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/cxgb4/t4_msg.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/cxgb4/t4_msg.h')
| -rw-r--r-- | drivers/net/cxgb4/t4_msg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/cxgb4/t4_msg.h index a550d0c706f3..eb71b8250b91 100644 --- a/drivers/net/cxgb4/t4_msg.h +++ b/drivers/net/cxgb4/t4_msg.h | |||
| @@ -123,6 +123,7 @@ enum { | |||
| 123 | ULP_MODE_NONE = 0, | 123 | ULP_MODE_NONE = 0, |
| 124 | ULP_MODE_ISCSI = 2, | 124 | ULP_MODE_ISCSI = 2, |
| 125 | ULP_MODE_RDMA = 4, | 125 | ULP_MODE_RDMA = 4, |
| 126 | ULP_MODE_TCPDDP = 5, | ||
| 126 | ULP_MODE_FCOE = 6, | 127 | ULP_MODE_FCOE = 6, |
| 127 | }; | 128 | }; |
| 128 | 129 | ||