Commit 1c32ca9f 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: (38 commits)
  Revert "staging: tidspbridge: replace iommu custom for opensource implementation"
  Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
  Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"
  Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"
  Revert "staging: tidspbridge - fix mmufault support"
  Revert "staging: tidspbridge - remove hw directory"
  Revert "staging: tidspbridge - move all iommu related code to a new file"
  Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
  Revert "staging: tidspbridge - remove reserved memory clean up"
  Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"
  Revert "staging: tidspbridge - remove dmm custom module"
  Revert "staging: tidspbridge - update Kconfig to select IOMMU module"
  staging: tidspbridge: hardcode SCM macros while fix is upstreamed
  Staging: keucr driver: fix uninitialized variable & proper memset length
  omap: dsp: remove shm from normal memory
  Staging: wlan-ng: Fix wrong #ifdef #endif sequence
  Staging: Update parameters for cfg80211 key management operation
  Staging: ath6kl: Fix pointer casts on 64-bit architectures
  Staging: batman-adv: suppress false warning when changing the mac address
  Staging: batman-adv: fix interface alternating and bonding reggression
  ...
parents 00dad7fa 94fb7c9c

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -5676,7 +5676,7 @@ S: Maintained 




STAGING SUBSYSTEM

STAGING SUBSYSTEM

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@suse.de>

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

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

L:	devel@driverdev.osuosl.org

L:	devel@driverdev.osuosl.org

S:	Maintained

S:	Maintained

F:	drivers/staging/

F:	drivers/staging/

arch/arm/plat-omap/devices.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -284,12 +284,14 @@ void __init omap_dsp_reserve_sdram_memblock(void) 
	if (!size)

	if (!size)

		return;

		return;





	paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT);

	paddr = memblock_alloc(size, SZ_1M);

	if (!paddr) {

	if (!paddr) {

		pr_err("%s: failed to reserve %x bytes\n",

		pr_err("%s: failed to reserve %x bytes\n",

				__func__, size);

				__func__, size);

		return;

		return;

	}

	}

	memblock_free(paddr, size);

	memblock_remove(paddr, size);





	omap_dsp_phys_mempool_base = paddr;

	omap_dsp_phys_mempool_base = paddr;

}

}

drivers/staging/ath6kl/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ config AR600x_BT_RESET_PIN 




config ATH6KL_CFG80211

config ATH6KL_CFG80211

	bool "CFG80211 support"

	bool "CFG80211 support"

	depends on ATH6K_LEGACY

	depends on ATH6K_LEGACY && CFG80211

	help

	help

	Enables support for CFG80211 APIs. The default option is to use WEXT. Even with this option enabled, WEXT is not explicitly disabled and the onus of not exercising WEXT lies on the application(s) running in the user space.

	Enables support for CFG80211 APIs. The default option is to use WEXT. Even with this option enabled, WEXT is not explicitly disabled and the onus of not exercising WEXT lies on the application(s) running in the user space.

drivers/staging/ath6kl/os/linux/ar6000_drv.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1126,7 +1126,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, A_UINT32 address, A 
        if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) {

        if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) {

            A_UINT32 param;

            A_UINT32 param;





            status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(((A_UINT32)fw_entry->data) + board_data_size), board_ext_data_size);

            status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(fw_entry->data + board_data_size), board_ext_data_size);





            if (status != A_OK) {

            if (status != A_OK) {

                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__));

                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__));
@@ -3030,7 +3030,8 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev) 
        A_UINT8 csumDest=0;

        A_UINT8 csumDest=0;

        A_UINT8 csum=skb->ip_summed;

        A_UINT8 csum=skb->ip_summed;

        if(csumOffload && (csum==CHECKSUM_PARTIAL)){

        if(csumOffload && (csum==CHECKSUM_PARTIAL)){

            csumStart=skb->csum_start-(skb->network_header-skb->head)+sizeof(ATH_LLC_SNAP_HDR);

            csumStart = (skb->head + skb->csum_start - skb_network_header(skb) +

			 sizeof(ATH_LLC_SNAP_HDR));

            csumDest=skb->csum_offset+csumStart;

            csumDest=skb->csum_offset+csumStart;

        }

        }

#endif

#endif

drivers/staging/ath6kl/os/linux/cfg80211.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -808,7 +808,7 @@ ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status) 




static int

static int

ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

                      A_UINT8 key_index, const A_UINT8 *mac_addr,

                      A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr,

                      struct key_params *params)

                      struct key_params *params)

{

{

    AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);

    AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
@@ -901,7 +901,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 




static int

static int

ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

                      A_UINT8 key_index, const A_UINT8 *mac_addr)

                      A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr)

{

{

    AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);

    AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
@@ -936,7 +936,8 @@ ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 




static int

static int

ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,

ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,

                      A_UINT8 key_index, const A_UINT8 *mac_addr, void *cookie,

                      A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr,

                      void *cookie,

                      void (*callback)(void *cookie, struct key_params*))

                      void (*callback)(void *cookie, struct key_params*))

{

{

    AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);

    AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE