From be005b651d93f05c935ea55c91e9a7e1490b7c87 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 29 Mar 2006 09:36:46 -0800 Subject: [PATCH] --- yaml --- r: 24803 b: refs/heads/master c: ef12d4561900d4af37f46a8f2d97dec3c4d59bf9 h: refs/heads/master i: 24801: ac3f16b69801e6fd3e40b21f2e2d19e29c447130 24799: 814f99f7be8b3275b26516698f1fe4e7664d22e6 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 968c2bfa859c..5c3404c67c73 100644 --- 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 index 53a32f65788d..9b0bd7c746ca 100644 --- 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);