diff options
author | Antoine Tenart <antoine.tenart@bootlin.com> | 2019-08-12 10:45:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-08-15 19:31:12 -0400 |
commit | 1f0239de58d60e0c4b44a35953004d180dd9ce6c (patch) | |
tree | 30b0c8a3cbcd775fb1a45e515c27d087528464ec | |
parent | d8c964dccae30dc326e2bd7170d6919858bc5cff (diff) |
net: mscc: remove the frame_info cpuq member
In struct frame_info, the cpuq member is never used. This cosmetic patch
removes it from the structure, and from the parsing of the frame header
as it's only set but never used.
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/mscc/ocelot.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/mscc/ocelot_board.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.h b/drivers/net/ethernet/mscc/ocelot.h index e0da8b4eddf2..515dee6fa8a6 100644 --- a/drivers/net/ethernet/mscc/ocelot.h +++ b/drivers/net/ethernet/mscc/ocelot.h | |||
@@ -45,7 +45,6 @@ struct frame_info { | |||
45 | u32 len; | 45 | u32 len; |
46 | u16 port; | 46 | u16 port; |
47 | u16 vid; | 47 | u16 vid; |
48 | u8 cpuq; | ||
49 | u8 tag_type; | 48 | u8 tag_type; |
50 | }; | 49 | }; |
51 | 50 | ||
diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c index 5e4f1718dd99..df8d15994a89 100644 --- a/drivers/net/ethernet/mscc/ocelot_board.c +++ b/drivers/net/ethernet/mscc/ocelot_board.c | |||
@@ -33,7 +33,6 @@ static int ocelot_parse_ifh(u32 *_ifh, struct frame_info *info) | |||
33 | 33 | ||
34 | info->port = IFH_EXTRACT_BITFIELD64(ifh[1], 43, 4); | 34 | info->port = IFH_EXTRACT_BITFIELD64(ifh[1], 43, 4); |
35 | 35 | ||
36 | info->cpuq = IFH_EXTRACT_BITFIELD64(ifh[1], 20, 8); | ||
37 | info->tag_type = IFH_EXTRACT_BITFIELD64(ifh[1], 16, 1); | 36 | info->tag_type = IFH_EXTRACT_BITFIELD64(ifh[1], 16, 1); |
38 | info->vid = IFH_EXTRACT_BITFIELD64(ifh[1], 0, 12); | 37 | info->vid = IFH_EXTRACT_BITFIELD64(ifh[1], 0, 12); |
39 | 38 | ||