提交 0fe6de49 编写于 作者: R Roopa Prabhu 提交者: David S. Miller

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: NThomas Graf <tgraf@suug.ch>
Signed-off-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 c66ad9ca
...@@ -105,7 +105,7 @@ static int br_fill_ifvlaninfo_compressed(struct sk_buff *skb, ...@@ -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, ...@@ -142,12 +142,14 @@ static int br_fill_ifvlaninfo_compressed(struct sk_buff *skb,
vid_range_flags = flags; vid_range_flags = flags;
} }
/* Call it once more to send any left over vlans */ if (vid_range_start != 0) {
err = br_fill_ifvlaninfo_range(skb, vid_range_start, /* Call it once more to send any left over vlans */
vid_range_end, err = br_fill_ifvlaninfo_range(skb, vid_range_start,
vid_range_flags); vid_range_end,
if (err) vid_range_flags);
return err; if (err)
return err;
}
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册