Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 676859ee authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

net: pch_gbe: Use proper accessors to BE data in pch_ptp_match() 



[ Upstream commit 443ef39b499cc9c6635f83238101f1bb923e9326 ]

Sparse is not happy about handling of strict types in pch_ptp_match():

  .../pch_gbe_main.c:158:33: warning: incorrect type in argument 2 (different base types)
  .../pch_gbe_main.c:158:33:    expected unsigned short [usertype] uid_hi
  .../pch_gbe_main.c:158:33:    got restricted __be16 [usertype]
  .../pch_gbe_main.c:158:45: warning: incorrect type in argument 3 (different base types)
  .../pch_gbe_main.c:158:45:    expected unsigned int [usertype] uid_lo
  .../pch_gbe_main.c:158:45:    got restricted __be32 [usertype]
  .../pch_gbe_main.c:158:56: warning: incorrect type in argument 4 (different base types)
  .../pch_gbe_main.c:158:56:    expected unsigned short [usertype] seqid
  .../pch_gbe_main.c:158:56:    got restricted __be16 [usertype]

Fix that by switching to use proper accessors to BE data.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarFlavio Suligoi <f.suligoi@asem.it>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe1f45c5

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c

+6 −13
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid) 
{

	u8 *data = skb->data;

	unsigned int offset;

	u16 *hi, *id;

	u16 hi, id;

	u32 lo;



	if (ptp_classify_raw(skb) == PTP_CLASS_NONE)
@@ -135,14 +135,11 @@ static int pch_ptp_match(struct sk_buff *skb, u16 uid_hi, u32 uid_lo, u16 seqid) 
	if (skb->len < offset + OFF_PTP_SEQUENCE_ID + sizeof(seqid))

		return 0;



	hi = (u16 *)(data + offset + OFF_PTP_SOURCE_UUID);

	id = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID);

	hi = get_unaligned_be16(data + offset + OFF_PTP_SOURCE_UUID + 0);

	lo = get_unaligned_be32(data + offset + OFF_PTP_SOURCE_UUID + 2);

	id = get_unaligned_be16(data + offset + OFF_PTP_SEQUENCE_ID);



	memcpy(&lo, &hi[1], sizeof(lo));



	return (uid_hi == *hi &&

		uid_lo == lo &&

		seqid  == *id);

	return (uid_hi == hi && uid_lo == lo && seqid == id);

}



static void
@@ -152,7 +149,6 @@ pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb) 
	struct pci_dev *pdev;

	u64 ns;

	u32 hi, lo, val;

	u16 uid, seq;



	if (!adapter->hwts_rx_en)

		return;
@@ -168,10 +164,7 @@ pch_rx_timestamp(struct pch_gbe_adapter *adapter, struct sk_buff *skb) 
	lo = pch_src_uuid_lo_read(pdev);

	hi = pch_src_uuid_hi_read(pdev);



	uid = hi & 0xffff;

	seq = (hi >> 16) & 0xffff;



	if (!pch_ptp_match(skb, htons(uid), htonl(lo), htons(seq)))

	if (!pch_ptp_match(skb, hi, lo, hi >> 16))

		goto out;



	ns = pch_rx_snap_read(pdev);