hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

niu: introduce temp variables to avoid sparse warnings when swapping in-situ 

Suppress a large block of warnings like:
drivers/net/niu.c:7094:38: warning: incorrect type in assignment (different base types)
drivers/net/niu.c:7094:38:    expected restricted __be32 [usertype] ip4src
drivers/net/niu.c:7094:38:    got unsigned long long
drivers/net/niu.c:7104:17: warning: cast from restricted __be32
...

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harvey Harrison 2010-10-13 18:59:13 +00:00 committed by David S. Miller
parent 81ccb499e7
commit ed440e82fe
1 changed files with 36 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/net/niu.c
View File

@ -7090,24 +7090,20 @@ static int niu_get_hash_opts(struct niu *np, struct ethtool_rxnfc *nfc)
static void niu_get_ip4fs_from_tcam_key(struct niu_tcam_entry *tp, static void niu_get_ip4fs_from_tcam_key(struct niu_tcam_entry *tp,
struct ethtool_rx_flow_spec *fsp) struct ethtool_rx_flow_spec *fsp)
{ {
u32 tmp;
u16 prt;
fsp->h_u.tcp_ip4_spec.ip4src = (tp->key[3] & TCAM_V4KEY3_SADDR) >> tmp = (tp->key[3] & TCAM_V4KEY3_SADDR) >> TCAM_V4KEY3_SADDR_SHIFT;
TCAM_V4KEY3_SADDR_SHIFT; fsp->h_u.tcp_ip4_spec.ip4src = cpu_to_be32(tmp);
fsp->h_u.tcp_ip4_spec.ip4dst = (tp->key[3] & TCAM_V4KEY3_DADDR) >>
TCAM_V4KEY3_DADDR_SHIFT;
fsp->m_u.tcp_ip4_spec.ip4src = (tp->key_mask[3] & TCAM_V4KEY3_SADDR) >>
TCAM_V4KEY3_SADDR_SHIFT;
fsp->m_u.tcp_ip4_spec.ip4dst = (tp->key_mask[3] & TCAM_V4KEY3_DADDR) >>
TCAM_V4KEY3_DADDR_SHIFT;
fsp->h_u.tcp_ip4_spec.ip4src = tmp = (tp->key[3] & TCAM_V4KEY3_DADDR) >> TCAM_V4KEY3_DADDR_SHIFT;
cpu_to_be32(fsp->h_u.tcp_ip4_spec.ip4src); fsp->h_u.tcp_ip4_spec.ip4dst = cpu_to_be32(tmp);
fsp->m_u.tcp_ip4_spec.ip4src =
cpu_to_be32(fsp->m_u.tcp_ip4_spec.ip4src); tmp = (tp->key_mask[3] & TCAM_V4KEY3_SADDR) >> TCAM_V4KEY3_SADDR_SHIFT;
fsp->h_u.tcp_ip4_spec.ip4dst = fsp->m_u.tcp_ip4_spec.ip4src = cpu_to_be32(tmp);
cpu_to_be32(fsp->h_u.tcp_ip4_spec.ip4dst);
fsp->m_u.tcp_ip4_spec.ip4dst = tmp = (tp->key_mask[3] & TCAM_V4KEY3_DADDR) >> TCAM_V4KEY3_DADDR_SHIFT;
cpu_to_be32(fsp->m_u.tcp_ip4_spec.ip4dst); fsp->m_u.tcp_ip4_spec.ip4dst = cpu_to_be32(tmp);
fsp->h_u.tcp_ip4_spec.tos = (tp->key[2] & TCAM_V4KEY2_TOS) >> fsp->h_u.tcp_ip4_spec.tos = (tp->key[2] & TCAM_V4KEY2_TOS) >>
TCAM_V4KEY2_TOS_SHIFT; TCAM_V4KEY2_TOS_SHIFT;
@ -7118,54 +7114,40 @@ static void niu_get_ip4fs_from_tcam_key(struct niu_tcam_entry *tp,
case TCP_V4_FLOW: case TCP_V4_FLOW:
case UDP_V4_FLOW: case UDP_V4_FLOW:
case SCTP_V4_FLOW: case SCTP_V4_FLOW:
fsp->h_u.tcp_ip4_spec.psrc = prt = ((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16; TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
fsp->h_u.tcp_ip4_spec.pdst = fsp->h_u.tcp_ip4_spec.psrc = cpu_to_be16(prt);
((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
fsp->m_u.tcp_ip4_spec.psrc =
((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
fsp->m_u.tcp_ip4_spec.pdst =
((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
fsp->h_u.tcp_ip4_spec.psrc = prt = ((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
cpu_to_be16(fsp->h_u.tcp_ip4_spec.psrc); TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
fsp->h_u.tcp_ip4_spec.pdst = fsp->h_u.tcp_ip4_spec.pdst = cpu_to_be16(prt);
cpu_to_be16(fsp->h_u.tcp_ip4_spec.pdst);
fsp->m_u.tcp_ip4_spec.psrc = prt = ((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
cpu_to_be16(fsp->m_u.tcp_ip4_spec.psrc); TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
fsp->m_u.tcp_ip4_spec.pdst = fsp->m_u.tcp_ip4_spec.psrc = cpu_to_be16(prt);
cpu_to_be16(fsp->m_u.tcp_ip4_spec.pdst);
prt = ((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
fsp->m_u.tcp_ip4_spec.pdst = cpu_to_be16(prt);
break; break;
case AH_V4_FLOW: case AH_V4_FLOW:
case ESP_V4_FLOW: case ESP_V4_FLOW:
fsp->h_u.ah_ip4_spec.spi = tmp = (tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
(tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT;
fsp->m_u.ah_ip4_spec.spi =
(tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT; TCAM_V4KEY2_PORT_SPI_SHIFT;
fsp->h_u.ah_ip4_spec.spi = cpu_to_be32(tmp);
fsp->h_u.ah_ip4_spec.spi = tmp = (tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
cpu_to_be32(fsp->h_u.ah_ip4_spec.spi); TCAM_V4KEY2_PORT_SPI_SHIFT;
fsp->m_u.ah_ip4_spec.spi = fsp->m_u.ah_ip4_spec.spi = cpu_to_be32(tmp);
cpu_to_be32(fsp->m_u.ah_ip4_spec.spi);
break; break;
case IP_USER_FLOW: case IP_USER_FLOW:
fsp->h_u.usr_ip4_spec.l4_4_bytes = tmp = (tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
(tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT;
fsp->m_u.usr_ip4_spec.l4_4_bytes =
(tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
TCAM_V4KEY2_PORT_SPI_SHIFT; TCAM_V4KEY2_PORT_SPI_SHIFT;
fsp->h_u.usr_ip4_spec.l4_4_bytes = cpu_to_be32(tmp);
fsp->h_u.usr_ip4_spec.l4_4_bytes = tmp = (tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
cpu_to_be32(fsp->h_u.usr_ip4_spec.l4_4_bytes); TCAM_V4KEY2_PORT_SPI_SHIFT;
fsp->m_u.usr_ip4_spec.l4_4_bytes = fsp->m_u.usr_ip4_spec.l4_4_bytes = cpu_to_be32(tmp);
cpu_to_be32(fsp->m_u.usr_ip4_spec.l4_4_bytes);
fsp->h_u.usr_ip4_spec.proto = fsp->h_u.usr_ip4_spec.proto =
(tp->key[2] & TCAM_V4KEY2_PROTO) >> (tp->key[2] & TCAM_V4KEY2_PROTO) >>