aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_3ad.c2
-rw-r--r--drivers/net/bonding/bond_main.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 7fde4d5c2b28..3c45358844eb 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1870,8 +1870,6 @@ static void ad_marker_info_received(struct bond_marker *marker_info,
1870static void ad_marker_response_received(struct bond_marker *marker, 1870static void ad_marker_response_received(struct bond_marker *marker,
1871 struct port *port) 1871 struct port *port)
1872{ 1872{
1873 marker = NULL;
1874 port = NULL;
1875 /* DO NOTHING, SINCE WE DECIDED NOT TO IMPLEMENT THIS FEATURE FOR NOW */ 1873 /* DO NOTHING, SINCE WE DECIDED NOT TO IMPLEMENT THIS FEATURE FOR NOW */
1876} 1874}
1877 1875
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 317a49480475..1c6a773c87ea 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3751,7 +3751,6 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)
3751 struct slave *slave; 3751 struct slave *slave;
3752 struct list_head *iter; 3752 struct list_head *iter;
3753 struct bond_up_slave *new_arr, *old_arr; 3753 struct bond_up_slave *new_arr, *old_arr;
3754 int slaves_in_agg;
3755 int agg_id = 0; 3754 int agg_id = 0;
3756 int ret = 0; 3755 int ret = 0;
3757 3756
@@ -3782,7 +3781,6 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)
3782 } 3781 }
3783 goto out; 3782 goto out;
3784 } 3783 }
3785 slaves_in_agg = ad_info.ports;
3786 agg_id = ad_info.aggregator_id; 3784 agg_id = ad_info.aggregator_id;
3787 } 3785 }
3788 bond_for_each_slave(bond, slave, iter) { 3786 bond_for_each_slave(bond, slave, iter) {