Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / ehea / ehea_phyp.h

diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ehea/ehea_phyp.h
index 89b63531ff261261ba0e897ce7938049482dfc4c..faa191d23b8614f095bb0a39bc93673304cb330d 100644 (file)
--- a/drivers/net/ehea/ehea_phyp.h
+++ b/drivers/net/ehea/ehea_phyp.h
@@ -126,6 +126,7 @@ struct hcp_modify_qp_cb0 {
 #define H_QP_CR_STATE_RDY2RCV      0x0000030000000000ULL /*  Ready to recv */
 #define H_QP_CR_STATE_RDY2SND      0x0000050000000000ULL /*  Ready to send */
 #define H_QP_CR_STATE_ERROR        0x0000800000000000ULL /*  Error */
+#define H_QP_CR_RES_STATE          0x0000007F00000000ULL /* Resultant state */
 
 struct hcp_modify_qp_cb1 {
        u32 qpn;                /* 00 */