lkml.org 
[lkml]   [2022]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 07/26] net: dsa: microchip: ksz8_r_dyn_mac_table(): remove timestamp support
    Date
    We do not use FDB timestamps. So, drop it.

    Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
    ---
    drivers/net/dsa/microchip/ksz8.h | 2 +-
    drivers/net/dsa/microchip/ksz8795.c | 7 ++-----
    2 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h
    index ea05abfbd51d..ad8e69051347 100644
    --- a/drivers/net/dsa/microchip/ksz8.h
    +++ b/drivers/net/dsa/microchip/ksz8.h
    @@ -20,7 +20,7 @@ void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port);
    int ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);
    int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val);
    int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
    - u8 *fid, u8 *src_port, u8 *timestamp, u16 *entries);
    + u8 *fid, u8 *src_port, u16 *entries);
    int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr,
    struct alu_struct *alu);
    void ksz8_w_sta_mac_table(struct ksz_device *dev, u16 addr,
    diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
    index e0530bc3bec0..d0cfe74d5b13 100644
    --- a/drivers/net/dsa/microchip/ksz8795.c
    +++ b/drivers/net/dsa/microchip/ksz8795.c
    @@ -395,7 +395,7 @@ static int ksz8_valid_dyn_entry(struct ksz_device *dev, u8 *data)
    }

    int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
    - u8 *fid, u8 *src_port, u8 *timestamp, u16 *entries)
    + u8 *fid, u8 *src_port, u16 *entries)
    {
    u32 data_hi, data_lo;
    const u8 *shifts;
    @@ -440,8 +440,6 @@ int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
    shifts[DYNAMIC_MAC_FID];
    *src_port = (data_hi & masks[DYNAMIC_MAC_TABLE_SRC_PORT]) >>
    shifts[DYNAMIC_MAC_SRC_PORT];
    - *timestamp = (data_hi & masks[DYNAMIC_MAC_TABLE_TIMESTAMP]) >>
    - shifts[DYNAMIC_MAC_TIMESTAMP];

    mac_addr[5] = (u8)data_lo;
    mac_addr[4] = (u8)(data_lo >> 8);
    @@ -956,14 +954,13 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port,
    int ret = 0;
    u16 i = 0;
    u16 entries = 0;
    - u8 timestamp = 0;
    u8 fid;
    u8 src_port;
    u8 mac[ETH_ALEN];

    do {
    ret = ksz8_r_dyn_mac_table(dev, i, mac, &fid, &src_port,
    - &timestamp, &entries);
    + &entries);
    if (!ret && port == src_port) {
    ret = cb(mac, 0, false, data);
    if (ret)
    --
    2.30.2
    \
     
     \ /
      Last update: 2022-11-28 13:00    [W:4.076 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site