ionic: git_ts_info bit shifters
authorShannon Nelson <snelson@pensando.io>
Tue, 13 Apr 2021 17:22:16 +0000 (10:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2021 22:00:33 +0000 (15:00 -0700)
All the uses of HWTSTAMP_FILTER_* values need to be
bit shifters, not straight values.

v2: fixed subject and added Cc Dan and SoB Allen

Fixes: f8ba81da73fc ("ionic: add ethtool support for PTP")
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: Allen Hubbe <allenbh@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c

index 71db1e2..6583be5 100644 (file)
@@ -888,55 +888,55 @@ static int ionic_get_ts_info(struct net_device *netdev,
 
        mask = cpu_to_le64(IONIC_PKT_CLS_NTP_ALL);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_NTP_ALL;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_NTP_ALL);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP1_SYNC);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V1_L4_SYNC;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V1_L4_SYNC);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP1_DREQ);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP1_ALL);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V1_L4_EVENT);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_L4_SYNC);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_L4_SYNC;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L4_SYNC);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_L4_DREQ);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_L4_ALL);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_L2_SYNC);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_L2_SYNC;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L2_SYNC);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_L2_DREQ);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_L2_ALL);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_SYNC);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_SYNC;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_SYNC);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_DREQ);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_DELAY_REQ;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_DELAY_REQ);
 
        mask = cpu_to_le64(IONIC_PKT_CLS_PTP2_ALL);
        if ((ionic->ident.lif.eth.hwstamp_rx_filters & mask) == mask)
-               info->rx_filters |= HWTSTAMP_FILTER_PTP_V2_EVENT;
+               info->rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);
 
        return 0;
 }