Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170670
b: refs/heads/master
c: 38fc002
h: refs/heads/master
v: v3
  • Loading branch information
Nicolas de Pesloüan authored and David S. Miller committed Oct 13, 2009
1 parent b2602a7 commit 09f338a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: c634263df5890daafe0ea470faee3305736bbc3d
refs/heads/master: 38fc0026da255aa328c3730a1c4d28b4e11e6a2b
6 changes: 2 additions & 4 deletions trunk/drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3375,7 +3375,7 @@ static const struct file_operations bond_info_fops = {
.release = seq_release,
};

static int bond_create_proc_entry(struct bonding *bond)
static void bond_create_proc_entry(struct bonding *bond)
{
struct net_device *bond_dev = bond->dev;

Expand All @@ -3390,8 +3390,6 @@ static int bond_create_proc_entry(struct bonding *bond)
else
memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
}

return 0;
}

static void bond_remove_proc_entry(struct bonding *bond)
Expand Down Expand Up @@ -3430,7 +3428,7 @@ static void bond_destroy_proc_dir(void)

#else /* !CONFIG_PROC_FS */

static int bond_create_proc_entry(struct bonding *bond)
static void bond_create_proc_entry(struct bonding *bond)
{
}

Expand Down

0 comments on commit 09f338a

Please sign in to comment.