diff --git a/[refs] b/[refs] index ee33a9f03fee..0961db4e8b62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be3839520411df2806b188fff053c775a884cfce +refs/heads/master: 64d683c5825003ffb3b127057a165e6bfc26691e diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 53ee6a0a3681..bb928993db3a 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -4820,7 +4820,7 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[]) return 0; } -static int bond_get_tx_queues(struct net *net, const struct nlattr *tb[]) +static int bond_get_tx_queues(struct net *net, struct nlattr *tb[]) { return tx_queues; }