2015-11-30 22:12:52

by Jarod Wilson

Subject: [PATCH net-next] sfc: use ALIGN macro for aligning frame sizes

Don't open-code it.

CC: Solarflare linux maintainers <[email protected]>
CC: Shradha Shah <[email protected]>
CC: [email protected]
Signed-off-by: Jarod Wilson <[email protected]>
---
drivers/net/ethernet/sfc/net_driver.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index a8ddd12..746d591 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1502,8 +1502,9 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue,
* same cycle, the XMAC can miss the IPG altogether. We work around
* this by adding a further 16 bytes.
*/
+#define EFX_FRAME_PAD 16
#define EFX_MAX_FRAME_LEN(mtu) \
- ((((mtu) + ETH_HLEN + VLAN_HLEN + 4/* FCS */ + 7) & ~7) + 16)
+ (ALIGN(((mtu) + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN + EFX_FRAME_PAD), 8))

static inline bool efx_xmit_with_hwtstamp(struct sk_buff *skb)
{
--
1.8.3.1

2015-12-01 12:08:57

by Bert Kenward

Subject: Re: [PATCH net-next] sfc: use ALIGN macro for aligning frame sizes

On 30/11/15 22:12, Jarod Wilson wrote:
> Don't open-code it.
>
> CC: Solarflare linux maintainers <[email protected]>
> CC: Shradha Shah <[email protected]>
> CC: [email protected]
> Signed-off-by: Jarod Wilson <[email protected]>

Acked-by: Bert Kenward <[email protected]>

> ---
> drivers/net/ethernet/sfc/net_driver.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
> index a8ddd12..746d591 100644
> --- a/drivers/net/ethernet/sfc/net_driver.h
> +++ b/drivers/net/ethernet/sfc/net_driver.h
> @@ -1502,8 +1502,9 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue,
> * same cycle, the XMAC can miss the IPG altogether. We work around
> * this by adding a further 16 bytes.
> */
> +#define EFX_FRAME_PAD 16
> #define EFX_MAX_FRAME_LEN(mtu) \
> - ((((mtu) + ETH_HLEN + VLAN_HLEN + 4/* FCS */ + 7) & ~7) + 16)
> + (ALIGN(((mtu) + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN + EFX_FRAME_PAD), 8))
>
> static inline bool efx_xmit_with_hwtstamp(struct sk_buff *skb)
> {
>

2015-12-03 04:56:58

by David Miller

Subject: Re: [PATCH net-next] sfc: use ALIGN macro for aligning frame sizes

From: Jarod Wilson <[email protected]>
Date: Mon, 30 Nov 2015 17:12:21 -0500

> Don't open-code it.
>
> CC: Solarflare linux maintainers <[email protected]>
> CC: Shradha Shah <[email protected]>
> CC: [email protected]
> Signed-off-by: Jarod Wilson <[email protected]>

Applied, thank you.