projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Move flow control definitions to mii.h
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
tg3.c
diff --git
a/drivers/net/tg3.c
b/drivers/net/tg3.c
index 6e40d52107a410ad636f3b4bf1fce53bec2c29ad..f353f69caeb8357fa7f9c04d017b6ad9ede2cb2d 100644
(file)
--- a/
drivers/net/tg3.c
+++ b/
drivers/net/tg3.c
@@
-1187,9
+1187,9
@@
static void tg3_link_report(struct tg3 *tp)
printk(KERN_INFO PFX
"%s: Flow control is %s for TX and %s for RX.\n",
tp->dev->name,
printk(KERN_INFO PFX
"%s: Flow control is %s for TX and %s for RX.\n",
tp->dev->name,
- (tp->link_config.active_flowctrl &
TG3_
FLOW_CTRL_TX) ?
+ (tp->link_config.active_flowctrl & FLOW_CTRL_TX) ?
"on" : "off",
"on" : "off",
- (tp->link_config.active_flowctrl &
TG3_
FLOW_CTRL_RX) ?
+ (tp->link_config.active_flowctrl & FLOW_CTRL_RX) ?
"on" : "off");
tg3_ump_link_report(tp);
}
"on" : "off");
tg3_ump_link_report(tp);
}
@@
-1199,11
+1199,11
@@
static u16 tg3_advert_flowctrl_1000T(u8 flow_ctrl)
{
u16 miireg;
{
u16 miireg;
- if ((flow_ctrl &
TG3_FLOW_CTRL_TX) && (flow_ctrl & TG3_
FLOW_CTRL_RX))
+ if ((flow_ctrl &
FLOW_CTRL_TX) && (flow_ctrl &
FLOW_CTRL_RX))
miireg = ADVERTISE_PAUSE_CAP;
miireg = ADVERTISE_PAUSE_CAP;
- else if (flow_ctrl &
TG3_
FLOW_CTRL_TX)
+ else if (flow_ctrl & FLOW_CTRL_TX)
miireg = ADVERTISE_PAUSE_ASYM;
miireg = ADVERTISE_PAUSE_ASYM;
- else if (flow_ctrl &
TG3_
FLOW_CTRL_RX)
+ else if (flow_ctrl & FLOW_CTRL_RX)
miireg = ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
else
miireg = 0;
miireg = ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
else
miireg = 0;
@@
-1215,11
+1215,11
@@
static u16 tg3_advert_flowctrl_1000X(u8 flow_ctrl)
{
u16 miireg;
{
u16 miireg;
- if ((flow_ctrl &
TG3_FLOW_CTRL_TX) && (flow_ctrl & TG3_
FLOW_CTRL_RX))
+ if ((flow_ctrl &
FLOW_CTRL_TX) && (flow_ctrl &
FLOW_CTRL_RX))
miireg = ADVERTISE_1000XPAUSE;
miireg = ADVERTISE_1000XPAUSE;
- else if (flow_ctrl &
TG3_
FLOW_CTRL_TX)
+ else if (flow_ctrl & FLOW_CTRL_TX)
miireg = ADVERTISE_1000XPSE_ASYM;
miireg = ADVERTISE_1000XPSE_ASYM;
- else if (flow_ctrl &
TG3_
FLOW_CTRL_RX)
+ else if (flow_ctrl & FLOW_CTRL_RX)
miireg = ADVERTISE_1000XPAUSE | ADVERTISE_1000XPSE_ASYM;
else
miireg = 0;
miireg = ADVERTISE_1000XPAUSE | ADVERTISE_1000XPSE_ASYM;
else
miireg = 0;
@@
-1256,16
+1256,16
@@
static u8 tg3_resolve_flowctrl_1000X(u16 lcladv, u16 rmtadv)
if (lcladv & ADVERTISE_1000XPAUSE) {
if (lcladv & ADVERTISE_1000XPSE_ASYM) {
if (rmtadv & LPA_1000XPAUSE)
if (lcladv & ADVERTISE_1000XPAUSE) {
if (lcladv & ADVERTISE_1000XPSE_ASYM) {
if (rmtadv & LPA_1000XPAUSE)
- cap =
TG3_FLOW_CTRL_TX | TG3_
FLOW_CTRL_RX;
+ cap =
FLOW_CTRL_TX |
FLOW_CTRL_RX;
else if (rmtadv & LPA_1000XPAUSE_ASYM)
else if (rmtadv & LPA_1000XPAUSE_ASYM)
- cap =
TG3_
FLOW_CTRL_RX;
+ cap = FLOW_CTRL_RX;
} else {
if (rmtadv & LPA_1000XPAUSE)
} else {
if (rmtadv & LPA_1000XPAUSE)
- cap =
TG3_FLOW_CTRL_TX | TG3_
FLOW_CTRL_RX;
+ cap =
FLOW_CTRL_TX |
FLOW_CTRL_RX;
}
} else if (lcladv & ADVERTISE_1000XPSE_ASYM) {
if ((rmtadv & LPA_1000XPAUSE) && (rmtadv & LPA_1000XPAUSE_ASYM))
}
} else if (lcladv & ADVERTISE_1000XPSE_ASYM) {
if ((rmtadv & LPA_1000XPAUSE) && (rmtadv & LPA_1000XPAUSE_ASYM))
- cap =
TG3_
FLOW_CTRL_TX;
+ cap = FLOW_CTRL_TX;
}
return cap;
}
return cap;
@@
-1294,7
+1294,7
@@
static void tg3_setup_flow_control(struct tg3 *tp, u32 lcladv, u32 rmtadv)
tp->link_config.active_flowctrl = flowctrl;
tp->link_config.active_flowctrl = flowctrl;
- if (flowctrl &
TG3_
FLOW_CTRL_RX)
+ if (flowctrl & FLOW_CTRL_RX)
tp->rx_mode |= RX_MODE_FLOW_CTRL_ENABLE;
else
tp->rx_mode &= ~RX_MODE_FLOW_CTRL_ENABLE;
tp->rx_mode |= RX_MODE_FLOW_CTRL_ENABLE;
else
tp->rx_mode &= ~RX_MODE_FLOW_CTRL_ENABLE;
@@
-1302,7
+1302,7
@@
static void tg3_setup_flow_control(struct tg3 *tp, u32 lcladv, u32 rmtadv)
if (old_rx_mode != tp->rx_mode)
tw32_f(MAC_RX_MODE, tp->rx_mode);
if (old_rx_mode != tp->rx_mode)
tw32_f(MAC_RX_MODE, tp->rx_mode);
- if (flowctrl &
TG3_
FLOW_CTRL_TX)
+ if (flowctrl & FLOW_CTRL_TX)
tp->tx_mode |= TX_MODE_FLOW_CTRL_ENABLE;
else
tp->tx_mode &= ~TX_MODE_FLOW_CTRL_ENABLE;
tp->tx_mode |= TX_MODE_FLOW_CTRL_ENABLE;
else
tp->tx_mode &= ~TX_MODE_FLOW_CTRL_ENABLE;
@@
-9419,12
+9419,12
@@
static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam
epause->autoneg = (tp->tg3_flags & TG3_FLAG_PAUSE_AUTONEG) != 0;
epause->autoneg = (tp->tg3_flags & TG3_FLAG_PAUSE_AUTONEG) != 0;
- if (tp->link_config.active_flowctrl &
TG3_
FLOW_CTRL_RX)
+ if (tp->link_config.active_flowctrl & FLOW_CTRL_RX)
epause->rx_pause = 1;
else
epause->rx_pause = 0;
epause->rx_pause = 1;
else
epause->rx_pause = 0;
- if (tp->link_config.active_flowctrl &
TG3_
FLOW_CTRL_TX)
+ if (tp->link_config.active_flowctrl & FLOW_CTRL_TX)
epause->tx_pause = 1;
else
epause->tx_pause = 0;
epause->tx_pause = 1;
else
epause->tx_pause = 0;
@@
-9475,14
+9475,14
@@
static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
}
} else {
if (epause->rx_pause)
}
} else {
if (epause->rx_pause)
- tp->link_config.flowctrl |=
TG3_
FLOW_CTRL_RX;
+ tp->link_config.flowctrl |= FLOW_CTRL_RX;
else
else
- tp->link_config.flowctrl &= ~
TG3_
FLOW_CTRL_RX;
+ tp->link_config.flowctrl &= ~FLOW_CTRL_RX;
if (epause->tx_pause)
if (epause->tx_pause)
- tp->link_config.flowctrl |=
TG3_
FLOW_CTRL_TX;
+ tp->link_config.flowctrl |= FLOW_CTRL_TX;
else
else
- tp->link_config.flowctrl &= ~
TG3_
FLOW_CTRL_TX;
+ tp->link_config.flowctrl &= ~FLOW_CTRL_TX;
if (netif_running(dev))
tg3_setup_flow_control(tp, 0, 0);
if (netif_running(dev))
tg3_setup_flow_control(tp, 0, 0);
@@
-9502,13
+9502,13
@@
static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
else
tp->tg3_flags &= ~TG3_FLAG_PAUSE_AUTONEG;
if (epause->rx_pause)
else
tp->tg3_flags &= ~TG3_FLAG_PAUSE_AUTONEG;
if (epause->rx_pause)
- tp->link_config.flowctrl |=
TG3_
FLOW_CTRL_RX;
+ tp->link_config.flowctrl |= FLOW_CTRL_RX;
else
else
- tp->link_config.flowctrl &= ~
TG3_
FLOW_CTRL_RX;
+ tp->link_config.flowctrl &= ~FLOW_CTRL_RX;
if (epause->tx_pause)
if (epause->tx_pause)
- tp->link_config.flowctrl |=
TG3_
FLOW_CTRL_TX;
+ tp->link_config.flowctrl |= FLOW_CTRL_TX;
else
else
- tp->link_config.flowctrl &= ~
TG3_
FLOW_CTRL_TX;
+ tp->link_config.flowctrl &= ~FLOW_CTRL_TX;
if (netif_running(dev)) {
tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
if (netif_running(dev)) {
tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
@@
-13849,7
+13849,7
@@
static int __devinit tg3_init_one(struct pci_dev *pdev,
/* flow control autonegotiation is default behavior */
tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
/* flow control autonegotiation is default behavior */
tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
- tp->link_config.flowctrl =
TG3_FLOW_CTRL_TX | TG3_
FLOW_CTRL_RX;
+ tp->link_config.flowctrl =
FLOW_CTRL_TX |
FLOW_CTRL_RX;
tg3_init_coal(tp);
tg3_init_coal(tp);