diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-28 00:01:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-28 00:01:35 -0400 |
| commit | bb7e95c8fd859922c6cf3ebbb3a8546007df1748 (patch) | |
| tree | 58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7 /drivers/net/bonding/bond_alb.c | |
| parent | b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027 (diff) | |
| parent | 5447080cfa3c77154498dfbf225367ac85b4c2b5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x_main.c
Merge bnx2x bug fixes in by hand... :-/
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index e3b35d0b4284..c746b331771d 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
| @@ -815,7 +815,7 @@ static int rlb_initialize(struct bonding *bond) | |||
| 815 | 815 | ||
| 816 | /*initialize packet type*/ | 816 | /*initialize packet type*/ |
| 817 | pk_type->type = cpu_to_be16(ETH_P_ARP); | 817 | pk_type->type = cpu_to_be16(ETH_P_ARP); |
| 818 | pk_type->dev = NULL; | 818 | pk_type->dev = bond->dev; |
| 819 | pk_type->func = rlb_arp_recv; | 819 | pk_type->func = rlb_arp_recv; |
| 820 | 820 | ||
| 821 | /* register to receive ARPs */ | 821 | /* register to receive ARPs */ |