korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 04:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

liquidio: remove PTP support in 23XX adapters

Browse Source 
liquidio driver incorrectly indicates that PTP is supported in 23XX
adapters; this patch fixes that.  PTP is supported in 66XX and 68XX
adapters, and the driver correctly indicates that.

Signed-off-by: Prasad Kanneganti <prasad.kanneganti@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Satanand Burla <satananda.burla@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Prasad Kanneganti 2017-01-03 11:27:33 -08:00 committed by David S. Miller
parent ac4340fc3c
commit 9feb16ae0b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/cavium/liquidio/lio_main.c
View File

@ -2629,7 +2629,9 @@ static int liquidio_open(struct net_device *netdev)
oct->droq[0]->ops.poll_mode = 1; oct->droq[0]->ops.poll_mode = 1;
} }
oct_ptp_open(netdev); if ((oct->chip_id == OCTEON_CN66XX || oct->chip_id == OCTEON_CN68XX) &&
ptp_enable)
oct_ptp_open(netdev);
ifstate_set(lio, LIO_IFSTATE_RUNNING); ifstate_set(lio, LIO_IFSTATE_RUNNING);
@ -2973,9 +2975,13 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)
*/ */
static int liquidio_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) static int liquidio_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
{ {
struct lio *lio = GET_LIO(netdev);
switch (cmd) { switch (cmd) {
case SIOCSHWTSTAMP: case SIOCSHWTSTAMP:
return hwtstamp_ioctl(netdev, ifr); if ((lio->oct_dev->chip_id == OCTEON_CN66XX ||
lio->oct_dev->chip_id == OCTEON_CN68XX) && ptp_enable)
return hwtstamp_ioctl(netdev, ifr);
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }