Commit d072c88c authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: drop CPSW_HEADROOM define 



Since commit 1771afd4 ("net: cpsw: avoid alignment faults by taking
NET_IP_ALIGN into account") the TI CPSW driver was switched to use correct
define CPSW_HEADROOM_NA to avoid alignment faults, but there are two places
left where CPSW_HEADROOM is still used (without causing issues).

Hence, completely drop CPSW_HEADROOM define and use CPSW_HEADROOM_NA
everywhere to avoid further mistakes in code.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e782f5ba

drivers/net/ethernet/ti/cpsw.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev) 


static unsigned int cpsw_rxbuf_total_len(unsigned int len)

{

	len += CPSW_HEADROOM;

	len += CPSW_HEADROOM_NA;

	len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));



	return SKB_DATA_ALIGN(len);

drivers/net/ethernet/ti/cpsw_new.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev) 


static unsigned int cpsw_rxbuf_total_len(unsigned int len)

{

	len += CPSW_HEADROOM;

	len += CPSW_HEADROOM_NA;

	len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));



	return SKB_DATA_ALIGN(len);

drivers/net/ethernet/ti/cpsw_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -411,7 +411,6 @@ struct __aligned(sizeof(long)) cpsw_meta_xdp { 


/* The buf includes headroom compatible with both skb and xdpf */

#define CPSW_HEADROOM_NA (max(XDP_PACKET_HEADROOM, NET_SKB_PAD) + NET_IP_ALIGN)

#define CPSW_HEADROOM  ALIGN(CPSW_HEADROOM_NA, sizeof(long))



static inline int cpsw_is_xdpf_handle(void *handle)

{