Skip to content

baikal-xgbe: fixed compilation errors #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asheplyakov wants to merge 3 commits into
base: linux-4.9-mitx
Choose a base branch
from
Open

baikal-xgbe: fixed compilation errors #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd30833
baikal-xgbe: fixed compilation error in xgbe_poll_controller
asheplyakov May 31, 2020
b2d4875
baikal-xgbe: updated xgbe_setup_tc according to 4.9 API changes
asheplyakov May 31, 2020
24ef07e
baikal-xgbe: fixed be_xgbe_xmit_probe compilation error
asheplyakov May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions drivers/net/ethernet/baikal/xgbe/xgbe-drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,8 +1651,10 @@ static void xgbe_poll_controller(struct net_device *netdev)

if (pdata->per_channel_irq) {
channel = pdata->channel;
for (i = 0; i < pdata->channel_count; i++, channel++)
xgbe_dma_isr(channel->dma_irq, channel);
for (i = 0; i < pdata->channel_count; i++, channel++) {
xgbe_dma_tx_isr(channel->tx_dma_irq, channel);
xgbe_dma_rx_isr(channel->rx_dma_irq, channel);
}
} else {
disable_irq(pdata->dev_irq);
xgbe_isr(pdata->dev_irq, pdata);
Expand All @@ -1663,11 +1665,17 @@ static void xgbe_poll_controller(struct net_device *netdev)
}
#endif /* End CONFIG_NET_POLL_CONTROLLER */

static int xgbe_setup_tc(struct net_device *netdev, u8 tc)
static int xgbe_setup_tc(struct net_device *netdev, u32 handle, __be16 proto,
struct tc_to_netdev *tc_to_netdev)
{
struct xgbe_prv_data *pdata = netdev_priv(netdev);
unsigned int offset, queue;
u8 i;
u8 tc, i;

if (tc_to_netdev->type != TC_SETUP_MQPRIO)
return -EINVAL;

tc = tc_to_netdev->tc;

if (tc && (tc != pdata->hw_feat.tc_cnt))
return -EINVAL;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/baikal/xgbe/xgbe-mdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,11 @@ static int be_xgbe_xmit_probe(struct xgbe_prv_data *pdata)

phydev->speed = SPEED_10000;
phydev->duplex = DUPLEX_FULL;
phydev->dev.of_node = xmit_node;
phydev->mdio.dev.of_node = xmit_node;

pdata->phydev = phydev;
/* refcount is held by phy_attach_direct() on success */
put_device(&phydev->dev);
put_device(&phydev->mdio.dev);

#if 0
/* Add sysfs link to netdevice */
Expand Down