Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

diff --git a/drivers/infiniband/include/ib_cm.h b/drivers/infiniband/include/ib_cm.h
index e5d74a7..da65011 100644 (file)
--- a/drivers/infiniband/include/ib_cm.h
+++ b/drivers/infiniband/include/ib_cm.h
@@ -169,7 +169,8 @@ enum ib_cm_rej_reason {
        IB_CM_REJ_INVALID_ALT_TRAFFIC_CLASS     = __constant_htons(21),
        IB_CM_REJ_INVALID_ALT_HOP_LIMIT         = __constant_htons(22),
        IB_CM_REJ_INVALID_ALT_PACKET_RATE       = __constant_htons(23),
-       IB_CM_REJ_PORT_REDIRECT                 = __constant_htons(24),
+       IB_CM_REJ_PORT_CM_REDIRECT              = __constant_htons(24),
+       IB_CM_REJ_PORT_REDIRECT                 = __constant_htons(25),
        IB_CM_REJ_INVALID_MTU                   = __constant_htons(26),
        IB_CM_REJ_INSUFFICIENT_RESP_RESOURCES   = __constant_htons(27),
        IB_CM_REJ_CONSUMER_DEFINED              = __constant_htons(28),

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 6f60abb..fa00816 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -600,9 +600,10 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                        ipoib_mcast_send(dev, (union ib_gid *) (phdr->hwaddr + 4), skb);
                } else {
-                       /* unicast GID -- should be ARP reply */
+                       /* unicast GID -- should be ARP or RARP reply */
 
-                       if (be16_to_cpup((u16 *) skb->data) != ETH_P_ARP) {
+                       if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&
+                           (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {
                                ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x "
                                           IPOIB_GID_FMT "\n",
                                           skb->dst ? "neigh" : "dst",