diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-12 20:33:51 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-12 20:33:51 +0000 |
commit | 8688a1a8637c6b833b9b70148809db4538352d2e (patch) | |
tree | 7b5d6c2d83c8bd1686811501c6287a650c40751b /net/dcb/dcbnl.c | |
parent | 3afdb0f3528991de0833224f2dba60dc061e01fa (diff) | |
parent | f91f9cd505f92e4227ffda7e5799a33d4f34bf36 (diff) | |
download | kernel_samsung_smdk4412-8688a1a8637c6b833b9b70148809db4538352d2e.zip kernel_samsung_smdk4412-8688a1a8637c6b833b9b70148809db4538352d2e.tar.gz kernel_samsung_smdk4412-8688a1a8637c6b833b9b70148809db4538352d2e.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable
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 d5074a5..c44348a 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) |