---

yaml
---
r: 5617
b: refs/heads/master
c: 0dca0f7
h: refs/heads/master
i:
  5615: 6896d9e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e38d36d88ead4e56f3155573976da84d5df18b3
+refs/heads/master: 0dca0f7bf82face7b700890318d5550fd542cabf

trunk/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",