diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-27 23:59:08 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-27 23:59:08 +0100 |
commit | 1397e171f143878dd16ad5f8c99f7b9440cc8911 (patch) | |
tree | 8aadcac291a2550028950bcaa5d8d0c0d6bedc45 /net/core/rtnetlink.c | |
parent | inetpeer: Mark metrics as "new" in fresh inetpeer entries. (diff) | |
parent | ipv6: Remove route peer binding assertions. (diff) | |
download | linux-1397e171f143878dd16ad5f8c99f7b9440cc8911.tar.xz linux-1397e171f143878dd16ad5f8c99f7b9440cc8911.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index c668f8c371b2..b706271ccb18 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1122,8 +1122,7 @@ static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[]) return -EOPNOTSUPP; if (af_ops->validate_link_af) { - err = af_ops->validate_link_af(dev, - tb[IFLA_AF_SPEC]); + err = af_ops->validate_link_af(dev, af); if (err < 0) return err; } |