diff options
| author | David S. Miller | 2011-03-04 06:27:42 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-03-04 06:27:42 +0100 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /net/dcb/dcbnl.c | |
| parent | netlink: kill eff_cap from struct netlink_skb_parms (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| download | kernel-qcow2-linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.tar.gz kernel-qcow2-linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.tar.xz kernel-qcow2-linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
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 d8b4f725b778..118392f3872e 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) |