lkml.org 
[lkml]   [2017]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 2/6] net: dsa: do not cast dst
    Date
    dsa_ptr is not a void pointer anymore since Nov 2011, as of cf50dcc24f82
    ("dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions"),
    but an explicit dsa_switch_tree pointer, thus remove the (void *) cast.

    Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
    ---
    net/dsa/dsa2.c | 2 +-
    net/dsa/legacy.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
    index 4301f52e4f5a..c4afeca6f478 100644
    --- a/net/dsa/dsa2.c
    +++ b/net/dsa/dsa2.c
    @@ -454,7 +454,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
    * sent to the tag format's receive function.
    */
    wmb();
    - dst->master_netdev->dsa_ptr = (void *)dst;
    + dst->master_netdev->dsa_ptr = dst;
    dst->applied = true;

    return 0;
    diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
    index ac4379b8d7ac..d70a1a788d17 100644
    --- a/net/dsa/legacy.c
    +++ b/net/dsa/legacy.c
    @@ -651,7 +651,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev,
    * sent to the tag format's receive function.
    */
    wmb();
    - dev->dsa_ptr = (void *)dst;
    + dev->dsa_ptr = dst;

    return 0;
    }
    --
    2.13.0
    \
     
     \ /
      Last update: 2017-05-30 20:37    [W:3.494 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site