---

yaml --- r: 24803 b: refs/heads/master c: ef12d45 h: refs/heads/master i: 24801: ac3f16b 24799: 814f99f v: v3
git-mirror · Mar 29, 2006 · be005b6 · be005b6
1 parent 1198709
commit be005b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a07bacca7b4032dd361ad5c87b1c39ae229e6739
+refs/heads/master: ef12d4561900d4af37f46a8f2d97dec3c4d59bf9
diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -723,7 +723,7 @@ static int ipoib_hard_header(struct sk_buff *skb,
 	 * destination address onto the front of the skb so we can
 	 * figure out where to send the packet later.
 	 */
-	if (!skb->dst || !skb->dst->neighbour) {
+	if ((!skb->dst || !skb->dst->neighbour) && daddr) {
 		struct ipoib_pseudoheader *phdr =
 			(struct ipoib_pseudoheader *) skb_push(skb, sizeof *phdr);
 		memcpy(phdr->hwaddr, daddr, INFINIBAND_ALEN);