diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:02:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:02:58 +1100 |
| commit | d7eaf400f583154283e26244ee671585cd413156 (patch) | |
| tree | 6ac8efcd27bf4d9e8aef4862eeb0b45fca4a5187 /net | |
| parent | 79b1d1f5860545973461d0dcb1f0e8d9c32dbdbe (diff) | |
| parent | f684c699592229c3aebf656363bcb0cf86df2570 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
fs/fs-writeback.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/rtnetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index d4ff41739b0f..31ca3dc4c888 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2587,7 +2587,7 @@ static int rtnl_bridge_notify(struct net_device *dev, u16 flags) if ((!flags || (flags & BRIDGE_FLAGS_MASTER)) && br_dev && br_dev->netdev_ops->ndo_bridge_getlink) { - err = br_dev->netdev_ops->ndo_bridge_getlink(skb, 0, 0, dev, 0); + err = br_dev->netdev_ops->ndo_bridge_getlink(skb, 0, 0, br_dev, 0); if (err < 0) goto errout; } |