diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-17 19:14:12 +0100 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-17 19:14:12 +0100 |
commit | 325d1605542960903c88409b199734a3d8fc6612 (patch) | |
tree | 9d8eeed393a3b5dcadd1ddb6b76634b464fd6bc7 /net/dcb/dcbnl.c | |
parent | arch/tile: fix deadlock bugs in rwlock implementation (diff) | |
parent | Linux 2.6.38 (diff) | |
download | linux-325d1605542960903c88409b199734a3d8fc6612.tar.xz linux-325d1605542960903c88409b199734a3d8fc6612.zip |
Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'net/dcb/dcbnl.c')
-rw-r--r-- | net/dcb/dcbnl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index d5074a567289..c44348adba3b 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1193,7 +1193,7 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlattr **tb, goto err; } - if (ieee[DCB_ATTR_IEEE_PFC] && ops->ieee_setets) { + if (ieee[DCB_ATTR_IEEE_PFC] && ops->ieee_setpfc) { struct ieee_pfc *pfc = nla_data(ieee[DCB_ATTR_IEEE_PFC]); err = ops->ieee_setpfc(netdev, pfc); if (err) |