Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 15712
b: refs/heads/master
c: 0f418b2
h: refs/heads/master
v: v3
  • Loading branch information
Mitch Williams authored and John W. Linville committed Nov 13, 2005
1 parent 8aafbbf commit 5a14f53
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c61b75ad03f3a30ef247cac27406f030c10628b0
refs/heads/master: 0f418b2ac49e97b7b763e0473320a201eec15ed3
4 changes: 2 additions & 2 deletions trunk/drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3278,8 +3278,8 @@ static void bond_info_show_master(struct seq_file *seq)

if (USES_PRIMARY(bond->params.mode)) {
seq_printf(seq, "Primary Slave: %s\n",
(bond->params.primary[0]) ?
bond->params.primary : "None");
(bond->primary_slave) ?
bond->primary_slave->dev->name : "None");

seq_printf(seq, "Currently Active Slave: %s\n",
(curr) ? curr->dev->name : "None");
Expand Down

0 comments on commit 5a14f53

Please sign in to comment.