2018-09-25 19:53:09

by Hauke Mehrtens

Subject: [PATCH] mt76: use skb_pad() instead of __skb_pad()

mt76 uses __skb_pad() with free_on_error set to true, this is the same
as calling skb_pad().
This patch does not change any functionality, but it makes it easier to
backport this driver in backports, because skb_pad() is also available
in older kernel versions.

Fixes: b40b15e1521f ("mt76: add usb support to mt76 layer")
Signed-off-by: Hauke Mehrtens <[email protected]>
---
drivers/net/wireless/mediatek/mt76/usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 7780b07543bb..e03de13f5afe 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -535,7 +535,7 @@ int mt76u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
}

if (unlikely(pad)) {
- if (__skb_pad(last, pad, true))
+ if (skb_pad(last, pad))
return -ENOMEM;
__skb_put(last, pad);
}
--
2.11.0

2018-09-26 15:35:22

by Felix Fietkau

Subject: Re: [PATCH] mt76: use skb_pad() instead of __skb_pad()

On 2018-09-25 21:52, Hauke Mehrtens wrote:
> mt76 uses __skb_pad() with free_on_error set to true, this is the same
> as calling skb_pad().
> This patch does not change any functionality, but it makes it easier to
> backport this driver in backports, because skb_pad() is also available
> in older kernel versions.
>
> Fixes: b40b15e1521f ("mt76: add usb support to mt76 layer")
> Signed-off-by: Hauke Mehrtens <[email protected]>
Merged, thanks.

- Felix