Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 966bc6f4 authored Mar 21, 2008 by Jay Vosburgh Committed by Jeff Garzik Mar 25, 2008

bonding: fix two compiler warnings



	Fix two compiler warnings that are new with recent versions of gcc
(apparently 4.2 and up).  One is fixed by refactoring; this change was
supplied by Stephen Hemminger.  The other was fixed by labelling the
variable as uninitialized_var() after confirming via inspection that it
cannot actually be used uninitialized.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 2bf86b7a

drivers/net/bonding/bond_alb.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -678,12 +678,8 @@ static struct slave rlb_choose_channel(struct sk_buff skb, struct bonding *bon
		}

		if (!list_empty(&bond->vlan_list)) {
		unsigned short vlan_id;
		int res = vlan_get_tag(skb, &vlan_id);
		if (!res) {
		if (!vlan_get_tag(skb, &client_info->vlan_id))
		client_info->tag = 1;
		client_info->vlan_id = vlan_id;
		}
		}

		if (!client_info->assigned) {

drivers/net/bonding/bond_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ struct vlan_entry bond_next_vlan(struct bonding bond, struct vlan_entry *curr)
		*/
		int bond_dev_queue_xmit(struct bonding bond, struct sk_buff skb, struct net_device *slave_dev)
		{
		unsigned short vlan_id;
		unsigned short uninitialized_var(vlan_id);

		if (!list_empty(&bond->vlan_list) &&
		!(slave_dev->features & NETIF_F_HW_VLAN_TX) &&