diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmgenet.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 25aa42b6cd34..6ebc1b979c01 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c | |||
@@ -1100,8 +1100,9 @@ static int bcmgenet_put_tx_csum(struct net_device *dev, struct sk_buff *skb) | |||
1100 | tx_csum_info |= STATUS_TX_CSUM_LV; | 1100 | tx_csum_info |= STATUS_TX_CSUM_LV; |
1101 | if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP) | 1101 | if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP) |
1102 | tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP; | 1102 | tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP; |
1103 | } else | 1103 | } else { |
1104 | tx_csum_info = 0; | 1104 | tx_csum_info = 0; |
1105 | } | ||
1105 | 1106 | ||
1106 | status->tx_csum_info = tx_csum_info; | 1107 | status->tx_csum_info = tx_csum_info; |
1107 | } | 1108 | } |
@@ -1529,11 +1530,11 @@ static int init_umac(struct bcmgenet_priv *priv) | |||
1529 | dev_dbg(kdev, "%s:Enabling RXDMA_BDONE interrupt\n", __func__); | 1530 | dev_dbg(kdev, "%s:Enabling RXDMA_BDONE interrupt\n", __func__); |
1530 | 1531 | ||
1531 | /* Monitor cable plug/unpluged event for internal PHY */ | 1532 | /* Monitor cable plug/unpluged event for internal PHY */ |
1532 | if (phy_is_internal(priv->phydev)) | 1533 | if (phy_is_internal(priv->phydev)) { |
1533 | cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP); | 1534 | cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP); |
1534 | else if (priv->ext_phy) | 1535 | } else if (priv->ext_phy) { |
1535 | cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP); | 1536 | cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP); |
1536 | else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) { | 1537 | } else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) { |
1537 | reg = bcmgenet_bp_mc_get(priv); | 1538 | reg = bcmgenet_bp_mc_get(priv); |
1538 | reg |= BIT(priv->hw_params->bp_in_en_shift); | 1539 | reg |= BIT(priv->hw_params->bp_in_en_shift); |
1539 | 1540 | ||