Changeset 37267


Ignore:
Timestamp:
2013-07-12T15:10:43+02:00 (5 years ago)
Author:
hauke
Message:

AA: acx-mac80211: make it compile with recent mac80211 again

backport of r35332, r36481 and r36976

Location:
branches/attitude_adjustment/package/acx-mac80211
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/attitude_adjustment/package/acx-mac80211/Makefile

    r33764 r37267  
    1919PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    2020PKG_SOURCE_VERSION:=$(PKG_REV) 
     21PKG_MIRROR_MD5SUM:=8d6bc84239059fd938ff4d989579f622 
    2122PKG_BUILD_DEPENDS:=mac80211 
     23 
     24PKG_CONFIG_DEPENDS:= \ 
     25        CONFIG_PACKAGE_MAC80211_DEBUGFS \ 
     26        CONFIG_PACKAGE_MAC80211_MESH \ 
    2227 
    2328include $(INCLUDE_DIR)/package.mk 
     
    173178        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ 
    174179        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \ 
    175  
    176 LINUX_AUTOCONF_FILE:= generated/autoconf.h 
     180        $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) \ 
     181        $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS -DCONFIG_MAC80211_DEBUGFS) \ 
     182        $(if $(CONFIG_PACKAGE_MAC80211_MESH), -DCONFIG_MAC80211_MESH) \ 
     183        -DBACKPORTED_KERNEL_NAME=\\\"$(PKG_SOURCE)\\\" \ 
     184        -DBACKPORTED_KERNEL_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\" \ 
     185        -DBACKPORTS_VERSION=\\\"unknown\\\" \ 
    177186 
    178187define Build/Compile 
     
    182191                SUBDIRS="$(PKG_BUILD_DIR)" \ 
    183192                $(PKG_EXTRA_KCONFIG) \ 
    184                 EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,7,0)\"" \ 
    185                 LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \ 
    186                         -Iarch/$(LINUX_KARCH)/include \ 
    187                         -include $(LINUX_AUTOCONF_FILE) \ 
    188                         -include linux/compat-2.6.h" \ 
     193                EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,10,0)\"" \ 
     194                LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \ 
     195                        -I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \ 
     196                        -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \ 
     197                        -I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \ 
     198                        -Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \ 
     199                        -include generated/autoconf.h \ 
     200                        -include backport/backport.h " \ 
    189201                V="$(V)" \ 
    190202                modules 
  • branches/attitude_adjustment/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch

    r33764 r37267  
    11--- a/main.h 
    22+++ b/main.h 
    3 @@ -44,8 +44,11 @@ void acx_process_rxbuf(acx_device_t *ade 
     3@@ -44,8 +44,11 @@ int acx_e_op_get_tx_stats(struct ieee802 
    44  
    55 #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39) 
     
    1616--- a/main.c 
    1717+++ b/main.c 
    18 @@ -1024,7 +1024,12 @@ out: 
     18@@ -1024,7 +1024,12 @@ int acx_e_op_get_tx_stats(struct ieee802 
    1919  * acx_compat, and hiding this #if/else.  OTOH, inclusion doesnt care 
    2020  * about old kernels 
  • branches/attitude_adjustment/package/acx-mac80211/patches/100-hw-queue-check-fix.patch

    r32417 r37267  
    11--- a/mem.c 
    22+++ b/mem.c 
    3 @@ -2026,7 +2026,7 @@ static int __devinit acxmem_probe(struct 
     3@@ -2036,7 +2036,7 @@ static int __devinit acxmem_probe(struct 
    44         */ 
    55        ieee->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) 
     
    1212--- a/pci.c 
    1313+++ b/pci.c 
    14 @@ -1010,7 +1010,7 @@ static int __devinit acxpci_probe(struct 
     14@@ -1022,7 +1022,7 @@ static int __devinit acxpci_probe(struct 
    1515                        BIT(NL80211_IFTYPE_STATION) | 
    1616                        BIT(NL80211_IFTYPE_ADHOC) | 
     
    2121  
    2222        /* TODO: although in the original driver the maximum value was 
    23 @@ -1682,7 +1682,7 @@ static __devinit int vlynq_probe(struct 
     23@@ -1691,7 +1691,7 @@ static __devinit int vlynq_probe(struct 
    2424                        BIT(NL80211_IFTYPE_STATION)     | 
    2525                        BIT(NL80211_IFTYPE_ADHOC) | 
     
    3232--- a/usb.c 
    3333+++ b/usb.c 
    34 @@ -1627,7 +1627,7 @@ acxusb_probe(struct usb_interface *intf, 
     34@@ -1624,7 +1624,7 @@ acxusb_probe(struct usb_interface *intf, 
    3535         */ 
    3636        ieee->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) 
  • branches/attitude_adjustment/package/acx-mac80211/patches/200-initial-macaddr.patch

    r33764 r37267  
    1 --- a/cardsetting.c     2012-07-03 16:21:25.934102662 -0700 
    2 +++ b/cardsetting.c     2012-07-03 16:49:26.910438174 -0700 
    3 @@ -710,12 +710,27 @@ 
     1--- a/cardsetting.c 
     2+++ b/cardsetting.c 
     3@@ -710,12 +710,27 @@ static int acx1xx_get_station_id(acx_dev 
    44        u8 stationID[4 + acx_ie_descs[ACX1xx_IE_DOT11_STATION_ID].len]; 
    55        const u8 *paddr; 
Note: See TracChangeset for help on using the changeset viewer.