aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2014-11-28 08:34:25 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-02 23:01:24 -0500
commit2c3c031c8f8930861815fa1685d7c5e8ccec047c (patch)
tree4c056c1c531e69f758bcf2c51d072f60ff01d2ab /drivers/net
parent345cd494a324c149ef7293f4bedf2d7131a6de7c (diff)
bridge: add brport flags to dflt bridge_getlink
To allow brport device to return current brport flags set on port. Add returned flags to nested IFLA_PROTINFO netlink msg built in dflt getlink. With this change, netlink msg returned for bridge_getlink contains the port's offloaded flag settings (the port's SELF settings). Signed-off-by: Scott Feldman <sfeldma@gmail.com> Signed-off-by: Jiri Pirko <jiri@resnulli.us> Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com> Acked-by: Thomas Graf <tgraf@suug.ch> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index dc77ec2bdafd..e0ab7673afe7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4367,7 +4367,8 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
4367 4367
4368 return ndo_dflt_bridge_getlink(skb, pid, seq, dev, 4368 return ndo_dflt_bridge_getlink(skb, pid, seq, dev,
4369 hsw_mode == PORT_FWD_TYPE_VEPA ? 4369 hsw_mode == PORT_FWD_TYPE_VEPA ?
4370 BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB); 4370 BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB,
4371 0, 0);
4371} 4372}
4372 4373
4373#ifdef CONFIG_BE2NET_VXLAN 4374#ifdef CONFIG_BE2NET_VXLAN
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 74aadeb56ada..9afa167d52a6 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7778,7 +7778,7 @@ static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
7778 else 7778 else
7779 mode = BRIDGE_MODE_VEPA; 7779 mode = BRIDGE_MODE_VEPA;
7780 7780
7781 return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode); 7781 return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
7782} 7782}
7783 7783
7784static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev) 7784static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev)