Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bridge: remove oflags from setlink/dellink.

Commit 02dba4388d16 ("bridge: fix setlink/dellink notifications") removed usage of oflags in
both rtnl_bridge_setlink() and rtnl_bridge_dellink() methods. This patch removes this variable as it is no
longer needed.

Signed-off-by: Rami Rosen <rami.rosen@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Rosen, Rami and committed by
David S. Miller
4de8b413 7b46a644

+2 -6
+2 -6
net/core/rtnetlink.c
··· 2918 2918 struct net_device *dev; 2919 2919 struct nlattr *br_spec, *attr = NULL; 2920 2920 int rem, err = -EOPNOTSUPP; 2921 - u16 oflags, flags = 0; 2921 + u16 flags = 0; 2922 2922 bool have_flags = false; 2923 2923 2924 2924 if (nlmsg_len(nlh) < sizeof(*ifm)) ··· 2947 2947 } 2948 2948 } 2949 2949 } 2950 - 2951 - oflags = flags; 2952 2950 2953 2951 if (!flags || (flags & BRIDGE_FLAGS_MASTER)) { 2954 2952 struct net_device *br_dev = netdev_master_upper_dev_get(dev); ··· 2991 2993 struct net_device *dev; 2992 2994 struct nlattr *br_spec, *attr = NULL; 2993 2995 int rem, err = -EOPNOTSUPP; 2994 - u16 oflags, flags = 0; 2996 + u16 flags = 0; 2995 2997 bool have_flags = false; 2996 2998 2997 2999 if (nlmsg_len(nlh) < sizeof(*ifm)) ··· 3020 3022 } 3021 3023 } 3022 3024 } 3023 - 3024 - oflags = flags; 3025 3025 3026 3026 if (!flags || (flags & BRIDGE_FLAGS_MASTER)) { 3027 3027 struct net_device *br_dev = netdev_master_upper_dev_get(dev);