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 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
drivers
/
net
/
ixgbe
/
ixgbe_dcb_nl.c
diff --git
a/drivers/net/ixgbe/ixgbe_dcb_nl.c
b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index
dd4883f
..
71da325
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/
drivers/net/ixgbe/ixgbe_dcb_nl.c
@@
-488,7
+488,6
@@
static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
if (adapter->temp_dcb_cfg.pfc_mode_enable !=
adapter->dcb_cfg.pfc_mode_enable)
adapter->dcb_set_bitmap |= BIT_PFC;
- return;
}
/**