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

bridge: remove unnecessary check for vtbegin in br_fill_vlan_tinfo_range

vtbegin should not be NULL in this function, Its already checked by the
caller.

this should silence the below smatch complaint:
  net/bridge/br_netlink_tunnel.c:144 br_fill_vlan_tinfo_range()
    error: we previously assumed 'vtbegin' could be null (see line 130)

net/bridge/br_netlink_tunnel.c
   129
   130      if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
                    ^^^^^^^
Check for NULL.

Fixes: efa5356b ("bridge: per vlan dst_metadata netlink support")
Reported-By: NDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 85c727b5
...@@ -127,7 +127,7 @@ static int br_fill_vlan_tinfo_range(struct sk_buff *skb, ...@@ -127,7 +127,7 @@ static int br_fill_vlan_tinfo_range(struct sk_buff *skb,
{ {
int err; int err;
if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) { if (vtend && (vtend->vid - vtbegin->vid) > 0) {
/* add range to skb */ /* add range to skb */
err = br_fill_vlan_tinfo(skb, vtbegin->vid, err = br_fill_vlan_tinfo(skb, vtbegin->vid,
vtbegin->tinfo.tunnel_id, vtbegin->tinfo.tunnel_id,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册