mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 03:17:14 +08:00
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
diff -Naur old/Makefile new/Makefile
|
|
--- old/Makefile 2012-10-15 23:08:11.256904135 +1100
|
|
+++ new/Makefile 2012-10-15 23:08:18.970262327 +1100
|
|
@@ -15,21 +15,9 @@
|
|
|
|
ifneq ($(KERNELRELEASE),)
|
|
|
|
- LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
|
|
- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \
|
|
- echo TRUE; \
|
|
- else \
|
|
- echo FALSE; \
|
|
- fi \
|
|
- ))
|
|
+ LINUXVER_GOODFOR_CFG80211:=TRUE
|
|
|
|
- LINUXVER_WEXT_ONLY:=$(strip $(shell \
|
|
- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \
|
|
- echo FALSE; \
|
|
- else \
|
|
- echo TRUE; \
|
|
- fi \
|
|
- ))
|
|
+ LINUXVER_WEXT_ONLY:=FALSE
|
|
|
|
ifneq ($(API),)
|
|
ifeq ($(API), CFG80211)
|
|
diff -Naur old/src/wl/sys/wl_cfg80211.c new/src/wl/sys/wl_cfg80211.c
|
|
--- old/src/wl/sys/wl_cfg80211.c 2012-10-15 23:08:11.266904352 +1100
|
|
+++ new/src/wl/sys/wl_cfg80211.c 2012-10-15 23:08:32.313638398 +1100
|
|
@@ -42,7 +42,7 @@
|
|
enum nl80211_iftype type, u32 *flags, struct vif_params *params);
|
|
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid);
|
|
-static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
|
|
struct cfg80211_scan_request *request);
|
|
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
|
|
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
|
|
@@ -570,10 +570,12 @@
|
|
}
|
|
|
|
static s32
|
|
-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|
+wl_cfg80211_scan(struct wiphy *wiphy,
|
|
struct cfg80211_scan_request *request)
|
|
{
|
|
s32 err = 0;
|
|
+ struct wl_priv *wl = wiphy_to_wl(wiphy);
|
|
+ struct net_device *ndev = wl_to_ndev(wl);
|
|
|
|
CHECK_SYS_UP();
|
|
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
|
|
diff -Naur old/src/wl/sys/wl_iw.h new/src/wl/sys/wl_iw.h
|
|
--- old/src/wl/sys/wl_iw.h 2012-10-15 23:08:11.266904352 +1100
|
|
+++ new/src/wl/sys/wl_iw.h 2012-10-15 23:08:18.973595675 +1100
|
|
@@ -15,6 +15,7 @@
|
|
#ifndef _wl_iw_h_
|
|
#define _wl_iw_h_
|
|
|
|
+#include <linux/semaphore.h>
|
|
#include <linux/wireless.h>
|
|
|
|
#include <typedefs.h>
|
|
diff -Naur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c
|
|
--- old/src/wl/sys/wl_linux.c 2012-10-15 23:08:11.266904352 +1100
|
|
+++ new/src/wl/sys/wl_linux.c 2012-10-15 23:08:18.973595675 +1100
|
|
@@ -40,7 +40,6 @@
|
|
#include <linux/pci_ids.h>
|
|
#define WLC_MAXBSSCFG 1
|
|
|
|
-#include <asm/system.h>
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/pgtable.h>
|
|
@@ -385,7 +384,7 @@
|
|
#endif
|
|
.ndo_get_stats = wl_get_stats,
|
|
.ndo_set_mac_address = wl_set_mac_address,
|
|
- .ndo_set_multicast_list = wl_set_multicast_list,
|
|
+ .ndo_set_rx_mode = wl_set_multicast_list,
|
|
.ndo_do_ioctl = wl_ioctl
|
|
};
|
|
|