staging: wilc1000: Merge memcpy + le32_to_cpus to get_unaligned_le32 (7a047abb) · Commits · 戴 / test

drivers/staging/wilc1000/wilc_mon.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,7 @@ void wilc_wfi_monitor_rx(struct net_device mon_dev, u8 buff, u32 size)
		return;

		/* Get WILC header */
		memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
		le32_to_cpus(&header);
		header = get_unaligned_le32(buff - HOST_HDR_OFFSET);
		/*
		* The packet offset field contain info about what type of management
		* the frame we are dealing with and ack status

+1 −2

Original line number	Diff line number	Diff line
		@@ -1038,8 +1038,7 @@ void wilc_wfi_p2p_rx(struct wilc_vif vif, u8 buff, u32 size)
		s32 freq;
		__le16 fc;

		memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
		le32_to_cpus(&header);
		header = get_unaligned_le32(buff - HOST_HDR_OFFSET);
		pkt_offset = GET_PKT_OFFSET(header);

		if (pkt_offset & IS_MANAGMEMENT_CALLBACK) {

+3 −6

Original line number	Diff line number	Diff line
		@@ -703,8 +703,7 @@ static void wilc_wlan_handle_rx_buff(struct wilc wilc, u8 buffer, int size)

		do {
		buff_ptr = buffer + offset;
		memcpy(&header, buff_ptr, 4);
		le32_to_cpus(&header);
		header = get_unaligned_le32(buff_ptr);

		is_cfg_packet = (header >> 31) & 0x1;
		pkt_offset = (header >> 22) & 0x1ff;
		@@ -874,10 +873,8 @@ int wilc_wlan_firmware_download(struct wilc wilc, const u8 buffer,

		offset = 0;
		do {
		memcpy(&addr, &buffer[offset], 4);
		memcpy(&size, &buffer[offset + 4], 4);
		le32_to_cpus(&addr);
		le32_to_cpus(&size);
		addr = get_unaligned_le32(&buffer[offset]);
		size = get_unaligned_le32(&buffer[offset + 4]);
		acquire_bus(wilc, WILC_BUS_ACQUIRE_ONLY);
		offset += 8;
		while (((int)size) && (offset < buffer_size)) {