diff options
| author | Bert Kenward <bkenward@solarflare.com> | 2017-01-10 16:23:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-10 14:16:17 -0500 |
| commit | 08a7b29be9734adab7f64a7675764a39ab7d29e1 (patch) | |
| tree | b2e4b9317c1320b7a0a5157c941f39b30c7fc923 /drivers/net/ethernet/sfc/efx.c | |
| parent | 79f664edc1cf51a87d6681514ec89b6da5fef8e1 (diff) | |
| download | linux-stable-08a7b29be9734adab7f64a7675764a39ab7d29e1.tar.gz linux-stable-08a7b29be9734adab7f64a7675764a39ab7d29e1.tar.bz2 linux-stable-08a7b29be9734adab7f64a7675764a39ab7d29e1.zip | |
sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV
There's no good reason why this should be an SRIOV-only thing.
Thus, also move it out of SRIOV-specific files.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index ebeecb8fed45..eaae42fa109c 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -2334,6 +2334,17 @@ static int efx_set_features(struct net_device *net_dev, netdev_features_t data) return 0; } +int efx_get_phys_port_id(struct net_device *net_dev, + struct netdev_phys_item_id *ppid) +{ + struct efx_nic *efx = netdev_priv(net_dev); + + if (efx->type->get_phys_port_id) + return efx->type->get_phys_port_id(efx, ppid); + else + return -EOPNOTSUPP; +} + static int efx_vlan_rx_add_vid(struct net_device *net_dev, __be16 proto, u16 vid) { struct efx_nic *efx = netdev_priv(net_dev); @@ -2374,8 +2385,8 @@ static const struct net_device_ops efx_netdev_ops = { .ndo_set_vf_spoofchk = efx_sriov_set_vf_spoofchk, .ndo_get_vf_config = efx_sriov_get_vf_config, .ndo_set_vf_link_state = efx_sriov_set_vf_link_state, - .ndo_get_phys_port_id = efx_sriov_get_phys_port_id, #endif + .ndo_get_phys_port_id = efx_get_phys_port_id, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = efx_netpoll, #endif |