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

Commit 0fe6de49 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

bridge: fix uninitialized variable warning



net/bridge/br_netlink.c: In function ‘br_fill_ifinfo’:
net/bridge/br_netlink.c:146:32: warning: ‘vid_range_flags’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  err = br_fill_ifvlaninfo_range(skb, vid_range_start,
                                ^
net/bridge/br_netlink.c:108:6: note: ‘vid_range_flags’ was declared here
  u16 vid_range_flags;

Reported-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c66ad9ca
Loading
Loading
Loading
Loading
+9 −7
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ static int br_fill_ifvlaninfo_compressed(struct sk_buff *skb,
					 const struct net_port_vlans *pv)
					 const struct net_port_vlans *pv)
{
{
	u16 vid_range_start = 0, vid_range_end = 0;
	u16 vid_range_start = 0, vid_range_end = 0;
	u16 vid_range_flags;
	u16 vid_range_flags = 0;
	u16 pvid, vid, flags;
	u16 pvid, vid, flags;
	int err = 0;
	int err = 0;


@@ -142,12 +142,14 @@ static int br_fill_ifvlaninfo_compressed(struct sk_buff *skb,
		vid_range_flags = flags;
		vid_range_flags = flags;
	}
	}


	if (vid_range_start != 0) {
		/* Call it once more to send any left over vlans */
		/* Call it once more to send any left over vlans */
		err = br_fill_ifvlaninfo_range(skb, vid_range_start,
		err = br_fill_ifvlaninfo_range(skb, vid_range_start,
					       vid_range_end,
					       vid_range_end,
					       vid_range_flags);
					       vid_range_flags);
		if (err)
		if (err)
			return err;
			return err;
	}


	return 0;
	return 0;
}
}