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

Commit df9b29d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
parents 7bc30c23 28276a28

drivers/staging/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -117,8 +117,6 @@ source "drivers/staging/hv/Kconfig" 




source "drivers/staging/vme/Kconfig"

source "drivers/staging/vme/Kconfig"





source "drivers/staging/memrar/Kconfig"



source "drivers/staging/sep/Kconfig"

source "drivers/staging/sep/Kconfig"





source "drivers/staging/iio/Kconfig"

source "drivers/staging/iio/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ obj-$(CONFIG_VT6655) += vt6655/ 
obj-$(CONFIG_VT6656)		+= vt6656/

obj-$(CONFIG_VT6656)		+= vt6656/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/

obj-$(CONFIG_DX_SEP)            += sep/

obj-$(CONFIG_DX_SEP)            += sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio/

obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio/

drivers/staging/brcm80211/brcmsmac/wlc_main.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -6283,7 +6283,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw, 
	       ((preamble_type[1] == WLC_MM_PREAMBLE) ==

	       ((preamble_type[1] == WLC_MM_PREAMBLE) ==

		(txh->MModeFbrLen != 0)));

		(txh->MModeFbrLen != 0)));





	ac = wme_fifo2ac[queue];

	ac = skb_get_queue_mapping(p);

	if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) {

	if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) {

		uint frag_dur, dur, dur_fallback;

		uint frag_dur, dur, dur_fallback;
@@ -6919,7 +6919,6 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p, 
		preamble = 0;

		preamble = 0;

		if (IS_CCK(rspec)) {

		if (IS_CCK(rspec)) {

			if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)

			if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)

				WL_ERROR("Short CCK\n");

				rx_status->flag |= RX_FLAG_SHORTPRE;

				rx_status->flag |= RX_FLAG_SHORTPRE;

		} else if (IS_OFDM(rspec)) {

		} else if (IS_OFDM(rspec)) {

			rx_status->flag |= RX_FLAG_SHORTPRE;

			rx_status->flag |= RX_FLAG_SHORTPRE;
@@ -7079,10 +7078,8 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p) 
	if (ieee80211_is_probe_req(h->frame_control))

	if (ieee80211_is_probe_req(h->frame_control))

		goto toss;

		goto toss;





	if (is_amsdu) {

	if (is_amsdu)

		WL_ERROR("%s: is_amsdu causing toss\n", __func__);

		goto toss;

		goto toss;

	}





	wlc_recvctl(wlc, rxh, p);

	wlc_recvctl(wlc, rxh, p);

	return;

	return;

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c

+39 −39
Original line number Original line Diff line number Diff line
@@ -95,47 +95,47 @@ void put_request_value(struct net_device *dev, long lvalue); 
USHORT hdr_checksum(PPSEUDO_HDR pHdr);

USHORT hdr_checksum(PPSEUDO_HDR pHdr);





typedef struct _DSP_FILE_HDR {

typedef struct _DSP_FILE_HDR {

	long build_date;

	u32  build_date;

	long dsp_coff_date;

	u32  dsp_coff_date;

	long loader_code_address;

	u32  loader_code_address;

	long loader_code_size;

	u32  loader_code_size;

	long loader_code_end;

	u32  loader_code_end;

	long dsp_code_address;

	u32  dsp_code_address;

	long dsp_code_size;

	u32  dsp_code_size;

	long dsp_code_end;

	u32  dsp_code_end;

	long reserved[8];

	u32  reserved[8];

} __attribute__ ((packed)) DSP_FILE_HDR, *PDSP_FILE_HDR;

} __attribute__ ((packed)) DSP_FILE_HDR, *PDSP_FILE_HDR;





typedef struct _DSP_FILE_HDR_5 {

typedef struct _DSP_FILE_HDR_5 {

	long version_id;	// Version ID of this image format.

	u32  version_id;	// Version ID of this image format.

	long package_id;	// Package ID of code release.

	u32  package_id;	// Package ID of code release.

	long build_date;	// Date/time stamp when file was built.

	u32  build_date;	// Date/time stamp when file was built.

	long commands_offset;	// Offset to attached commands in Pseudo Hdr format.

	u32  commands_offset;	// Offset to attached commands in Pseudo Hdr format.

	long loader_offset;	// Offset to bootloader code.

	u32  loader_offset;	// Offset to bootloader code.

	long loader_code_address;	// Start address of bootloader.

	u32  loader_code_address;	// Start address of bootloader.

	long loader_code_end;	// Where bootloader code ends.

	u32  loader_code_end;	// Where bootloader code ends.

	long loader_code_size;

	u32  loader_code_size;

	long version_data_offset;	// Offset were scrambled version data begins.

	u32  version_data_offset;	// Offset were scrambled version data begins.

	long version_data_size;	// Size, in words, of scrambled version data.

	u32  version_data_size;	// Size, in words, of scrambled version data.

	long nDspImages;	// Number of DSP images in file.

	u32  nDspImages;	// Number of DSP images in file.

} __attribute__ ((packed)) DSP_FILE_HDR_5, *PDSP_FILE_HDR_5;

} __attribute__ ((packed)) DSP_FILE_HDR_5, *PDSP_FILE_HDR_5;





typedef struct _DSP_IMAGE_INFO {

typedef struct _DSP_IMAGE_INFO {

	long coff_date;		// Date/time when DSP Coff image was built.

	u32  coff_date;		// Date/time when DSP Coff image was built.

	long begin_offset;	// Offset in file where image begins.

	u32  begin_offset;	// Offset in file where image begins.

	long end_offset;	// Offset in file where image begins.

	u32  end_offset;	// Offset in file where image begins.

	long run_address;	// On chip Start address of DSP code.

	u32  run_address;	// On chip Start address of DSP code.

	long image_size;	// Size of image.

	u32  image_size;	// Size of image.

	long version;		// Embedded version # of DSP code.

	u32  version;		// Embedded version # of DSP code.

} __attribute__ ((packed)) DSP_IMAGE_INFO, *PDSP_IMAGE_INFO;

} __attribute__ ((packed)) DSP_IMAGE_INFO, *PDSP_IMAGE_INFO;





typedef struct _DSP_IMAGE_INFO_V6 {

typedef struct _DSP_IMAGE_INFO_V6 {

	long coff_date;		// Date/time when DSP Coff image was built.

	u32  coff_date;		// Date/time when DSP Coff image was built.

	long begin_offset;	// Offset in file where image begins.

	u32  begin_offset;	// Offset in file where image begins.

	long end_offset;	// Offset in file where image begins.

	u32  end_offset;	// Offset in file where image begins.

	long run_address;	// On chip Start address of DSP code.

	u32  run_address;	// On chip Start address of DSP code.

	long image_size;	// Size of image.

	u32  image_size;	// Size of image.

	long version;		// Embedded version # of DSP code.

	u32  version;		// Embedded version # of DSP code.

	unsigned short checksum;	// Dsp File checksum

	unsigned short checksum;	// Dsp File checksum

	unsigned short pad1;

	unsigned short pad1;

} __attribute__ ((packed)) DSP_IMAGE_INFO_V6, *PDSP_IMAGE_INFO_V6;

} __attribute__ ((packed)) DSP_IMAGE_INFO_V6, *PDSP_IMAGE_INFO_V6;
@@ -846,8 +846,8 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) 
			break;

			break;





		case STATE_DONE_DWNLD:

		case STATE_DONE_DWNLD:

			if (((UINT) (pUcFile) - (UINT) pFileStart) >=

			if (((unsigned long) (pUcFile) - (unsigned long) pFileStart) >=

				(UINT) FileLength) {

				(unsigned long) FileLength) {

				uiState = STATE_DONE_FILE;

				uiState = STATE_DONE_FILE;

				break;

				break;

			}

			}
@@ -901,11 +901,11 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength) 
								  &info->prov_list);

								  &info->prov_list);

						// Move to next entry if available

						// Move to next entry if available

						pUcFile =

						pUcFile =

							(UCHAR *) ((UINT) pUcFile +

							(UCHAR *) ((unsigned long) pUcFile +

								   (UINT) ((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(PSEUDO_HDR));

								   (unsigned long) ((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(PSEUDO_HDR));

						if ((UINT) (pUcFile) -

						if ((unsigned long) (pUcFile) -

							(UINT) (pFileStart) >=

							(unsigned long) (pFileStart) >=

							(UINT) FileLength) {

							(unsigned long) FileLength) {

							uiState =

							uiState =

								STATE_DONE_FILE;

								STATE_DONE_FILE;

						}

						}

drivers/staging/hv/channel.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -81,14 +81,14 @@ static void vmbus_setevent(struct vmbus_channel *channel) 




	if (channel->offermsg.monitor_allocated) {

	if (channel->offermsg.monitor_allocated) {

		/* Each u32 represents 32 channels */

		/* Each u32 represents 32 channels */

		set_bit(channel->offermsg.child_relid & 31,

		sync_set_bit(channel->offermsg.child_relid & 31,

			(unsigned long *) vmbus_connection.send_int_page +

			(unsigned long *) vmbus_connection.send_int_page +

			(channel->offermsg.child_relid >> 5));

			(channel->offermsg.child_relid >> 5));





		monitorpage = vmbus_connection.monitor_pages;

		monitorpage = vmbus_connection.monitor_pages;

		monitorpage++; /* Get the child to parent monitor page */

		monitorpage++; /* Get the child to parent monitor page */





		set_bit(channel->monitor_bit,

		sync_set_bit(channel->monitor_bit,

			(unsigned long *)&monitorpage->trigger_group

			(unsigned long *)&monitorpage->trigger_group

					[channel->monitor_grp].pending);

					[channel->monitor_grp].pending);
@@ -104,7 +104,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) 




	if (Channel->offermsg.monitor_allocated) {

	if (Channel->offermsg.monitor_allocated) {

		/* Each u32 represents 32 channels */

		/* Each u32 represents 32 channels */

		clear_bit(Channel->offermsg.child_relid & 31,

		sync_clear_bit(Channel->offermsg.child_relid & 31,

			  (unsigned long *)vmbus_connection.send_int_page +

			  (unsigned long *)vmbus_connection.send_int_page +

			  (Channel->offermsg.child_relid >> 5));

			  (Channel->offermsg.child_relid >> 5));
@@ -112,7 +112,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) 
			vmbus_connection.monitor_pages;

			vmbus_connection.monitor_pages;

		monitorPage++; /* Get the child to parent monitor page */

		monitorPage++; /* Get the child to parent monitor page */





		clear_bit(Channel->monitor_bit,

		sync_clear_bit(Channel->monitor_bit,

			  (unsigned long *)&monitorPage->trigger_group

			  (unsigned long *)&monitorPage->trigger_group

					[Channel->monitor_grp].Pending);

					[Channel->monitor_grp].Pending);

	}

	}