From 412fbd6522298d6178ad7718c85642b0efeb2d0a Mon Sep 17 00:00:00 2001 From: Greg Edwards Date: Fri, 23 Jul 2010 10:02:04 +0000 Subject: [PATCH] --- yaml --- r: 201313 b: refs/heads/master c: d8190dff018ffe932d17cae047c6b3d1c5fc7574 h: refs/heads/master i: 201311: 6886f2064b18fcf98dbfbfc9e73e35cb1a194853 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_alb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 84690c6479c2..790ab46edbd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64e724f62ab743d55229cd5e27ec8b068b68eb16 +refs/heads/master: d8190dff018ffe932d17cae047c6b3d1c5fc7574 diff --git a/trunk/drivers/net/bonding/bond_alb.c b/trunk/drivers/net/bonding/bond_alb.c index df483076eda6..8d7dfd2f1e90 100644 --- a/trunk/drivers/net/bonding/bond_alb.c +++ b/trunk/drivers/net/bonding/bond_alb.c @@ -822,7 +822,7 @@ static int rlb_initialize(struct bonding *bond) /*initialize packet type*/ pk_type->type = cpu_to_be16(ETH_P_ARP); - pk_type->dev = NULL; + pk_type->dev = bond->dev; pk_type->func = rlb_arp_recv; /* register to receive ARPs */