diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-03 05:05:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-03 05:05:58 +0300 |
| commit | 3715544750e4a250f881254900cccebc57509fde (patch) | |
| tree | 478205aefd34a74a0ed2f236c19291973d519fa4 /drivers/net/ethernet/emulex | |
| parent | 629161f649ca259cfc1473a98347b941dd7a52bc (diff) | |
| parent | 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe (diff) | |
| download | linux-3715544750e4a250f881254900cccebc57509fde.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 5 |
1 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 e34913177743..b69c42ee505a 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -4848,7 +4848,8 @@ err: } static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, - struct net_device *dev, u32 filter_mask) + struct net_device *dev, u32 filter_mask, + int nlflags) { struct be_adapter *adapter = netdev_priv(dev); int status = 0; @@ -4870,7 +4871,7 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, return ndo_dflt_bridge_getlink(skb, pid, seq, dev, hsw_mode == PORT_FWD_TYPE_VEPA ? BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB, - 0, 0); + 0, 0, nlflags); } #ifdef CONFIG_BE2NET_VXLAN |