Message ID | 20220927022802.16050-1-shangxiaojing@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 1469327bb3dd04c0c84692e9af930bdd3f7b4230 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [-next] ethernet: s2io: Use skb_put_data() instead of skb_put/memcpy pair | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Paolo Abeni <pabeni@redhat.com>: On Tue, 27 Sep 2022 10:28:02 +0800 you wrote: > Use skb_put_data() instead of skb_put() and memcpy(), which is shorter > and clear. Drop the tmp variable that is not needed any more. > > Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> > --- > drivers/net/ethernet/neterion/s2io.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Here is the summary with links: - [-next] ethernet: s2io: Use skb_put_data() instead of skb_put/memcpy pair https://git.kernel.org/netdev/net-next/c/1469327bb3dd You are awesome, thank you!
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index d8a77b0db50d..786334b5c53a 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -7359,10 +7359,9 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp) int get_off = ring_data->rx_curr_get_info.offset; int buf0_len = RXD_GET_BUFFER0_SIZE_3(rxdp->Control_2); int buf2_len = RXD_GET_BUFFER2_SIZE_3(rxdp->Control_2); - unsigned char *buff = skb_push(skb, buf0_len); struct buffAdd *ba = &ring_data->ba[get_block][get_off]; - memcpy(buff, ba->ba_0, buf0_len); + skb_put_data(skb, ba->ba_0, buf0_len); skb_put(skb, buf2_len); }
Use skb_put_data() instead of skb_put() and memcpy(), which is shorter and clear. Drop the tmp variable that is not needed any more. Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> --- drivers/net/ethernet/neterion/s2io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)