git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
net
/
dcb
/
dcbnl.c
diff --git
a/net/dcb/dcbnl.c
b/net/dcb/dcbnl.c
index
d8b4f72
..
118392f
100644
(file)
--- 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_set
ets
) {
+ if (ieee[DCB_ATTR_IEEE_PFC] && ops->ieee_set
pfc
) {
struct ieee_pfc *pfc = nla_data(ieee[DCB_ATTR_IEEE_PFC]);
err = ops->ieee_setpfc(netdev, pfc);
if (err)