diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-02 22:05:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-02 22:05:58 -0400 |
| commit | 3715544750e4a250f881254900cccebc57509fde (patch) | |
| tree | 478205aefd34a74a0ed2f236c19291973d519fa4 /drivers/net/ethernet/rocker | |
| parent | 629161f649ca259cfc1473a98347b941dd7a52bc (diff) | |
| parent | 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe (diff) | |
| download | op-kernel-dev-3715544750e4a250f881254900cccebc57509fde.zip op-kernel-dev-3715544750e4a250f881254900cccebc57509fde.tar.gz | |
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/rocker')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 062ba16..0c6f0a8 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4176,14 +4176,15 @@ static int rocker_port_bridge_setlink(struct net_device *dev, static int rocker_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev, - u32 filter_mask) + u32 filter_mask, int nlflags) { struct rocker_port *rocker_port = netdev_priv(dev); u16 mode = BRIDGE_MODE_UNDEF; u32 mask = BR_LEARNING | BR_LEARNING_SYNC; return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, - rocker_port->brport_flags, mask); + rocker_port->brport_flags, mask, + nlflags); } static int rocker_port_get_phys_port_name(struct net_device *dev, |
