提交 9feb16ae 编写于 作者: P Prasad Kanneganti 提交者: David S. Miller

liquidio: remove PTP support in 23XX adapters

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: NPrasad Kanneganti <prasad.kanneganti@cavium.com>
Signed-off-by: NFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: NDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: NSatanand Burla <satananda.burla@cavium.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ac4340fc
...@@ -2629,7 +2629,9 @@ static int liquidio_open(struct net_device *netdev) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册