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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: fix wireless drivers depends
  Staging: wireless drivers Kconfig change
  Staging: android: mark subsystem as broken
  Staging: remove stlc45xx driver
  Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload
  Staging: vt6656: fix the memory free bug in vntwusb_disconnect()
  Staging: Panel: prevent driver from calling misc_deregister twice on same ressource
  Staging: hv: fix oops in vmbus - missing #include
  Staging: hv: fix oops in vmbus - netvsc list_head
  Staging: hv: fix oops in vmbus - udev events
  Staging: hv: Fix vmbus load hang caused by faulty data packing
  Staging: hv: Fix null pointer error after vmbus loading
  Staging: hv TODO patches
parents eb2890c9 b881c6cb

drivers/staging/Kconfig

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


source "drivers/staging/pohmelfs/Kconfig"



source "drivers/staging/stlc45xx/Kconfig"



source "drivers/staging/b3dfg/Kconfig"



source "drivers/staging/phison/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ obj-$(CONFIG_ANDROID) += android/ 
obj-$(CONFIG_ANDROID)		+= dream/

obj-$(CONFIG_DST)		+= dst/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_STLC45XX)		+= stlc45xx/

obj-$(CONFIG_B3DFG)		+= b3dfg/

obj-$(CONFIG_IDE_PHISON)	+= phison/

obj-$(CONFIG_PLAN9AUTH)		+= p9auth/

drivers/staging/android/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ menu "Android" 


config ANDROID

	bool "Android Drivers"

	depends on BROKEN

	default N

	---help---

	  Enable support for various drivers needed on the Android platform

drivers/staging/hv/ChannelMgmt.h

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define _CHANNEL_MGMT_H_



#include <linux/list.h>

#include <linux/timer.h>

#include "RingBuffer.h"

#include "VmbusChannelInterface.h"

#include "VmbusPacketFormat.h"
@@ -54,7 +55,7 @@ enum vmbus_channel_message_type { 
	ChannelMessageViewRangeRemove		= 18,

#endif

	ChannelMessageCount

} __attribute__((packed));

};



struct vmbus_channel_message_header {

	enum vmbus_channel_message_type MessageType;

drivers/staging/hv/NetVsc.c

+4 −6
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static void NetVscOnReceive(struct hv_device *Device, 
	 */

	spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);

	while (!list_empty(&netDevice->ReceivePacketList)) {

		list_move_tail(&netDevice->ReceivePacketList, &listHead);

		list_move_tail(netDevice->ReceivePacketList.next, &listHead);

		if (++count == vmxferpagePacket->RangeCount + 1)

			break;

	}
@@ -1071,7 +1071,7 @@ static void NetVscOnReceive(struct hv_device *Device, 
		/* Return it to the freelist */

		spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);

		for (i = count; i != 0; i--) {

			list_move_tail(&listHead,

			list_move_tail(listHead.next,

				       &netDevice->ReceivePacketList);

		}

		spin_unlock_irqrestore(&netDevice->receive_packet_list_lock,
@@ -1085,8 +1085,7 @@ static void NetVscOnReceive(struct hv_device *Device, 
	}



	/* Remove the 1st packet to represent the xfer page packet itself */

	xferpagePacket = list_entry(&listHead, struct xferpage_packet,

				    ListEntry);

	xferpagePacket = (struct xferpage_packet*)listHead.next;

	list_del(&xferpagePacket->ListEntry);



	/* This is how much we can satisfy */
@@ -1102,8 +1101,7 @@ static void NetVscOnReceive(struct hv_device *Device, 


	/* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */

	for (i = 0; i < (count - 1); i++) {

		netvscPacket = list_entry(&listHead, struct hv_netvsc_packet,

					  ListEntry);

		netvscPacket = (struct hv_netvsc_packet*)listHead.next;

		list_del(&netvscPacket->ListEntry);



		/* Initialize the netvsc packet */

CRA Git | Maintained and supported by SUSTech CRA and CCSE