Fixes for 2.6.14+ kernels.
This commit is contained in:
parent
4d30d68c8b
commit
683b13dd75
1
CHANGES
1
CHANGES
|
@ -41,6 +41,7 @@
|
||||||
* Intersil Corporation as part of PRISM(R) chipset product development.
|
* Intersil Corporation as part of PRISM(R) chipset product development.
|
||||||
*
|
*
|
||||||
* --------------------------------------------------------------------
|
* --------------------------------------------------------------------
|
||||||
|
- Build fixes for 2.6.14+
|
||||||
- Change the type of 'request_pending' to take care of warnings.
|
- Change the type of 'request_pending' to take care of warnings.
|
||||||
- Fixes for warnings generated by the 'sparse' tool (Richard Kennedy)
|
- Fixes for warnings generated by the 'sparse' tool (Richard Kennedy)
|
||||||
- Add an explicit README.firmware containing copyright information
|
- Add an explicit README.firmware containing copyright information
|
||||||
|
|
|
@ -568,6 +568,10 @@ typedef void irqreturn_t;
|
||||||
#define in_atomic() 0
|
#define in_atomic() 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
|
||||||
|
#define URB_ASYNC_UNLINK 0
|
||||||
|
#endif
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7))
|
||||||
#define URB_ASYNC_UNLINK USB_ASYNC_UNLINK
|
#define URB_ASYNC_UNLINK USB_ASYNC_UNLINK
|
||||||
#define usb_fill_bulk_urb FILL_BULK_URB
|
#define usb_fill_bulk_urb FILL_BULK_URB
|
||||||
|
|
|
@ -50,7 +50,7 @@ endif
|
||||||
|
|
||||||
ifneq ($(KERNELRELEASE),)
|
ifneq ($(KERNELRELEASE),)
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(WLAN_SRC)/include $(WLAN_INCLUDE_DEBUG)
|
EXTRA_CFLAGS += -I$(WLAN_SRC)/include $(WLAN_INCLUDE_DEBUG) -DWLAN_HOSTIF=WLAN_NONE
|
||||||
|
|
||||||
ifeq ($(KERN_25), y)
|
ifeq ($(KERN_25), y)
|
||||||
|
|
||||||
|
|
|
@ -70,13 +70,12 @@
|
||||||
|
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
|
||||||
|
#include <wlan/version.h>
|
||||||
#include <wlan/wlan_compat.h>
|
#include <wlan/wlan_compat.h>
|
||||||
|
|
||||||
|
|
||||||
/*================================================================*/
|
/*================================================================*/
|
||||||
/* Project Includes */
|
/* Project Includes */
|
||||||
|
|
||||||
#include <wlan/version.h>
|
|
||||||
#include <wlan/p80211types.h>
|
#include <wlan/p80211types.h>
|
||||||
#include <wlan/p80211hdr.h>
|
#include <wlan/p80211hdr.h>
|
||||||
#include <wlan/p80211conv.h>
|
#include <wlan/p80211conv.h>
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
|
||||||
|
#include <wlan/version.h>
|
||||||
#include <wlan/wlan_compat.h>
|
#include <wlan/wlan_compat.h>
|
||||||
|
|
||||||
/*================================================================*/
|
/*================================================================*/
|
||||||
|
|
|
@ -70,12 +70,12 @@
|
||||||
#include <linux/wireless.h>
|
#include <linux/wireless.h>
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
|
|
||||||
|
#include <wlan/version.h>
|
||||||
#include <wlan/wlan_compat.h>
|
#include <wlan/wlan_compat.h>
|
||||||
|
|
||||||
/*================================================================*/
|
/*================================================================*/
|
||||||
/* Project Includes */
|
/* Project Includes */
|
||||||
|
|
||||||
#include <wlan/version.h>
|
|
||||||
#include <wlan/p80211types.h>
|
#include <wlan/p80211types.h>
|
||||||
#include <wlan/p80211hdr.h>
|
#include <wlan/p80211hdr.h>
|
||||||
#include <wlan/p80211mgmt.h>
|
#include <wlan/p80211mgmt.h>
|
||||||
|
|
|
@ -53,8 +53,6 @@
|
||||||
/*================================================================*/
|
/*================================================================*/
|
||||||
/* System Includes */
|
/* System Includes */
|
||||||
|
|
||||||
#define __NO_VERSION__ /* prevent the static definition */
|
|
||||||
|
|
||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
#include <linux/version.h>
|
#include <linux/version.h>
|
||||||
|
|
||||||
|
@ -70,12 +68,12 @@
|
||||||
#include <net/sock.h>
|
#include <net/sock.h>
|
||||||
#include <linux/netlink.h>
|
#include <linux/netlink.h>
|
||||||
|
|
||||||
|
#include <wlan/version.h>
|
||||||
#include <wlan/wlan_compat.h>
|
#include <wlan/wlan_compat.h>
|
||||||
|
|
||||||
/*================================================================*/
|
/*================================================================*/
|
||||||
/* Project Includes */
|
/* Project Includes */
|
||||||
|
|
||||||
#include <wlan/version.h>
|
|
||||||
#include <wlan/p80211types.h>
|
#include <wlan/p80211types.h>
|
||||||
#include <wlan/p80211hdr.h>
|
#include <wlan/p80211hdr.h>
|
||||||
#include <wlan/p80211mgmt.h>
|
#include <wlan/p80211mgmt.h>
|
||||||
|
@ -351,8 +349,13 @@ int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mibget_t *
|
||||||
void p80211indicate_init(void)
|
void p80211indicate_init(void)
|
||||||
{
|
{
|
||||||
DBFENTER;
|
DBFENTER;
|
||||||
nl_indicate =
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14))
|
||||||
netlink_kernel_create( P80211_NL_SOCK_IND, &p80211ind_rx);
|
netlink_kernel_create( P80211_NL_SOCK_IND, &p80211ind_rx);
|
||||||
|
#else
|
||||||
|
nl_indicate =
|
||||||
|
netlink_kernel_create( P80211_NL_SOCK_IND, P80211_NL_MCAST_GRP_MLME, &p80211ind_rx, THIS_MODULE);
|
||||||
|
|
||||||
|
#endif
|
||||||
if ( nl_indicate == NULL ) {
|
if ( nl_indicate == NULL ) {
|
||||||
WLAN_LOG_DEBUG(2,"Failed to create indicate netlink i/f.\n");
|
WLAN_LOG_DEBUG(2,"Failed to create indicate netlink i/f.\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/random.h>
|
#include <linux/random.h>
|
||||||
|
|
||||||
|
#include <wlan/version.h>
|
||||||
#include <wlan/wlan_compat.h>
|
#include <wlan/wlan_compat.h>
|
||||||
|
|
||||||
// #define WEP_DEBUG
|
// #define WEP_DEBUG
|
||||||
|
|
|
@ -2108,7 +2108,7 @@ hfa384x_dormem(
|
||||||
ctlx->outbuf.rmemreq.offset,
|
ctlx->outbuf.rmemreq.offset,
|
||||||
ctlx->outbuf.rmemreq.page);
|
ctlx->outbuf.rmemreq.page);
|
||||||
|
|
||||||
WLAN_LOG_DEBUG(4,"pktsize=%d\n",
|
WLAN_LOG_DEBUG(4,"pktsize=%ld\n",
|
||||||
ROUNDUP64(sizeof(ctlx->outbuf.rmemreq)));
|
ROUNDUP64(sizeof(ctlx->outbuf.rmemreq)));
|
||||||
|
|
||||||
ctlx->reapable = mode;
|
ctlx->reapable = mode;
|
||||||
|
@ -3131,7 +3131,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
WLAN_LOG_WARNING(
|
WLAN_LOG_WARNING(
|
||||||
"Read from index %d failed, continuing\n",
|
"Read from index %ld failed, continuing\n",
|
||||||
i );
|
i );
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -4320,7 +4320,7 @@ static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *r
|
||||||
if ( skblen >
|
if ( skblen >
|
||||||
(sizeof(p80211msg_lnxind_wlansniffrm_t) +
|
(sizeof(p80211msg_lnxind_wlansniffrm_t) +
|
||||||
WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {
|
WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {
|
||||||
WLAN_LOG_DEBUG(1, "overlen frm: len=%d\n",
|
WLAN_LOG_DEBUG(1, "overlen frm: len=%ld\n",
|
||||||
skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));
|
skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* WLAN_HOSTIF (generally set on the command line, not detected) */
|
/* WLAN_HOSTIF (generally set on the command line, not detected) */
|
||||||
|
#define WLAN_NONE 0
|
||||||
#define WLAN_PCMCIA 1
|
#define WLAN_PCMCIA 1
|
||||||
#define WLAN_ISA 2
|
#define WLAN_ISA 2
|
||||||
#define WLAN_PCI 3
|
#define WLAN_PCI 3
|
||||||
|
|
Loading…
Reference in New Issue