compat-wireless: refresh patches

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 8d1fd52e475ddcc6a8aa1361ff83a317052d044a..eba863733cabf2372e2cd45259b75a10e5abd1ea 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -175,7 +175,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6118,7 +6118,7 @@ static struct net_device *ipw2100_alloc_
+@@ -6112,7 +6112,7 @@ static struct net_device *ipw2100_alloc_
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -186,7 +186,7 @@ without creating a headache on maintenance of the pathes.
        priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11692,7 +11692,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11669,7 +11669,7 @@ static int ipw_prom_alloc(struct ipw_pri
        memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
  
        priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -195,7 +195,7 @@ without creating a headache on maintenance of the pathes.
  
        priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
        SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11831,7 +11831,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11808,7 +11808,7 @@ static int __devinit ipw_pci_probe(struc
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -206,7 +206,7 @@ without creating a headache on maintenance of the pathes.
        net_dev->wireless_handlers = &ipw_wx_handler_def;
 --- a/drivers/net/wireless/iwmc3200wifi/netdev.c
 +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
-@@ -129,7 +129,7 @@ void *iwm_if_alloc(int sizeof_bus, struc
+@@ -130,7 +130,7 @@ void *iwm_if_alloc(int sizeof_bus, struc
                goto out_priv;
        }
  
@@ -256,7 +256,7 @@ without creating a headache on maintenance of the pathes.
  #define LBS_DEB_LEAVE 0x00000002
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1103,7 +1103,7 @@ static const struct net_device_ops hwsim
+@@ -1104,7 +1104,7 @@ static const struct net_device_ops hwsim
  
  static void hwsim_mon_setup(struct net_device *dev)
  {

diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index a6128b9c6f4c311d057c8da61f41ba9daa882688..8669617cd04159f850cf7fdf4c6aeb4a6c6bcf7d 100644 (file)
--- a/patches/04-netns.patch
+++ b/patches/04-netns.patch
@@ -6,7 +6,7 @@ files...
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -4201,7 +4201,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -4203,7 +4203,9 @@ static int nl80211_wiphy_netns(struct sk
        if (!net_eq(wiphy_net(&rdev->wiphy), net))
                err = cfg80211_switch_netns(rdev, net);
  

diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch
index 9bd3bb88c51519968235dfc859824c12632f49d4..61a0f1e21191af3403efa862cb1c47c73e6d1fce 100644 (file)
--- a/patches/08-rename-iwl4965-config.patch
+++ b/patches/08-rename-iwl4965-config.patch
@@ -39,7 +39,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
  iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -3964,7 +3964,7 @@ static int iwl_pci_probe(struct pci_dev
+@@ -4080,7 +4080,7 @@ static int iwl_pci_probe(struct pci_dev
  #ifdef CONFIG_IWL5000
                iwlagn_hw_ops.hw_scan = NULL;
  #endif
@@ -48,7 +48,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
                iwl4965_hw_ops.hw_scan = NULL;
  #endif
        }
-@@ -4338,10 +4338,10 @@ static void __devexit iwl_pci_remove(str
+@@ -4461,10 +4461,10 @@ static void __devexit iwl_pci_remove(str
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
  static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index a3914ce0acc5845ccd068dcb9945dd4aef379169..89a3edc05f194f683d16a0cb9d2810ded16a5da6 100644 (file)
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -34,7 +34,7 @@ calls on compat code with only slight modifications.
  /*
 --- a/drivers/net/wireless/ath/ath5k/pci.c
 +++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -286,6 +286,9 @@ static int ath5k_pci_resume(struct devic
+@@ -287,6 +287,9 @@ static int ath5k_pci_resume(struct devic
        return 0;
  }
  
@@ -44,7 +44,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume);
  #define ATH5K_PM_OPS  (&ath5k_pm_ops)
  #else
-@@ -297,7 +300,12 @@ static struct pci_driver ath5k_pci_drive
+@@ -298,7 +301,12 @@ static struct pci_driver ath5k_pci_drive
        .id_table       = ath5k_pci_id_table,
        .probe          = ath5k_pci_probe,
        .remove         = __devexit_p(ath5k_pci_remove),
@@ -59,7 +59,7 @@ calls on compat code with only slight modifications.
  /*
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -326,14 +326,11 @@ static int ath_pci_resume(struct device
+@@ -316,14 +316,11 @@ static int ath_pci_resume(struct device
        return 0;
  }
  
@@ -79,7 +79,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS  (&ath9k_pm_ops)
  
-@@ -351,7 +348,12 @@ static struct pci_driver ath_pci_driver
+@@ -341,7 +338,12 @@ static struct pci_driver ath_pci_driver
        .id_table   = ath_pci_id_table,
        .probe      = ath_pci_probe,
        .remove     = ath_pci_remove,
@@ -94,7 +94,7 @@ calls on compat code with only slight modifications.
  int ath_pci_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
-@@ -4497,7 +4497,12 @@ static struct pci_driver iwl_driver = {
+@@ -4663,7 +4663,12 @@ static struct pci_driver iwl_driver = {
        .id_table = iwl_hw_card_ids,
        .probe = iwl_pci_probe,
        .remove = __devexit_p(iwl_pci_remove),
@@ -109,7 +109,7 @@ calls on compat code with only slight modifications.
  static int __init iwl_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-core.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
-@@ -2098,14 +2098,16 @@ int iwl_pci_resume(struct device *device
+@@ -2105,14 +2105,16 @@ int iwl_pci_resume(struct device *device
  }
  EXPORT_SYMBOL(iwl_pci_resume);
  
@@ -136,7 +136,7 @@ calls on compat code with only slight modifications.
  #endif /* CONFIG_PM */
 --- a/drivers/net/wireless/iwlwifi/iwl-core.h
 +++ b/drivers/net/wireless/iwlwifi/iwl-core.h
-@@ -634,7 +634,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
+@@ -620,7 +620,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr
  #ifdef CONFIG_PM
  int iwl_pci_suspend(struct device *device);
  int iwl_pci_resume(struct device *device);
@@ -151,7 +151,7 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
 +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
-@@ -4270,7 +4270,12 @@ static struct pci_driver iwl3945_driver
+@@ -4271,7 +4271,12 @@ static struct pci_driver iwl3945_driver
        .id_table = iwl3945_hw_card_ids,
        .probe = iwl3945_pci_probe,
        .remove = __devexit_p(iwl3945_pci_remove),

diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch
index 742b50019f74383350dd5d9445156e680d2842d3..1b9154bf5891bd98df8a281bade0dcaf66085bcf 100644 (file)
--- a/patches/12-iw_handler-changes.patch
+++ b/patches/12-iw_handler-changes.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6121,7 +6121,11 @@ static struct net_device *ipw2100_alloc_
+@@ -6115,7 +6115,11 @@ static struct net_device *ipw2100_alloc_
        netdev_attach_ops(dev, &ipw2100_netdev_ops);
        dev->ethtool_ops = &ipw2100_ethtool_ops;
        dev->wireless_handlers = &ipw2100_wx_handler_def;

diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index 1806ca0fa46a80cf06e74742e78d25d5d980a4c4..b99f0855a71f6ad6c2f167d34519ca7d6bb1bb45 100644 (file)
--- a/patches/15-symbol-export-conflicts.patch
+++ b/patches/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
 
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -2916,7 +2916,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -2952,7 +2952,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 6a9090fe827334922195b9430c20b02b1cfba4bd..c94528acf3a97623fb35d415f6612df6fc2c9436 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -56,7 +56,7 @@ here still, but for now we keep this here.
                bt_sock_reclassify_lock(sock, proto);
                module_put(bt_proto[proto]->owner);
        }
-@@ -445,7 +453,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -452,7 +460,11 @@ int bt_sock_ioctl(struct socket *sock, u
                if (sk->sk_state == BT_LISTEN)
                        return -EINVAL;
  
@@ -70,7 +70,7 @@ here still, but for now we keep this here.
                err = put_user(amount, (int __user *) arg);
 --- a/net/bluetooth/cmtp/capi.c
 +++ b/net/bluetooth/cmtp/capi.c
-@@ -383,7 +383,11 @@ static void cmtp_reset_ctr(struct capi_c
+@@ -384,7 +384,11 @@ static void cmtp_reset_ctr(struct capi_c
  
        BT_DBG("ctrl %p", ctrl);
  
@@ -99,7 +99,7 @@ here still, but for now we keep this here.
  #include <asm/system.h>
 --- a/net/bluetooth/hci_sock.c
 +++ b/net/bluetooth/hci_sock.c
-@@ -601,7 +601,11 @@ drop:
+@@ -605,7 +605,11 @@ drop:
        goto done;
  }
  
@@ -111,7 +111,7 @@ here still, but for now we keep this here.
  {
        struct hci_ufilter uf = { .opcode = 0 };
        struct sock *sk = sock->sk;
-@@ -756,8 +760,12 @@ static struct proto hci_sk_proto = {
+@@ -760,8 +764,12 @@ static struct proto hci_sk_proto = {
        .obj_size       = sizeof(struct hci_pinfo)
  };
  
@@ -164,7 +164,7 @@ here still, but for now we keep this here.
  };
 --- a/net/bluetooth/hidp/core.c
 +++ b/net/bluetooth/hidp/core.c
-@@ -313,6 +313,7 @@ static int hidp_send_report(struct hidp_
+@@ -316,6 +316,7 @@ static int hidp_send_report(struct hidp_
        return hidp_queue_report(session, buf, rsize);
  }
  
@@ -172,7 +172,7 @@ here still, but for now we keep this here.
  static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
                unsigned char report_type)
  {
-@@ -332,6 +333,16 @@ static int hidp_output_raw_report(struct
+@@ -335,6 +336,16 @@ static int hidp_output_raw_report(struct
                return -ENOMEM;
        return count;
  }
@@ -189,7 +189,7 @@ here still, but for now we keep this here.
  
  static void hidp_idle_timeout(unsigned long arg)
  {
-@@ -597,8 +608,14 @@ static int hidp_session(void *arg)
+@@ -600,8 +611,14 @@ static int hidp_session(void *arg)
        }
  
        if (session->hid) {
@@ -204,7 +204,7 @@ here still, but for now we keep this here.
        }
  
        /* Wakeup user-space polling for socket errors */
-@@ -711,6 +728,70 @@ static void hidp_close(struct hid_device
+@@ -714,6 +731,70 @@ static void hidp_close(struct hid_device
  {
  }
  
@@ -275,7 +275,7 @@ here still, but for now we keep this here.
  static int hidp_parse(struct hid_device *hid)
  {
        struct hidp_session *session = hid->driver_data;
-@@ -811,6 +892,7 @@ fault:
+@@ -814,6 +895,7 @@ fault:
  
        return err;
  }
@@ -283,7 +283,7 @@ here still, but for now we keep this here.
  
  int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock)
  {
-@@ -829,6 +911,39 @@ int hidp_add_connection(struct hidp_conn
+@@ -832,6 +914,39 @@ int hidp_add_connection(struct hidp_conn
  
        BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size);
  
@@ -323,7 +323,7 @@ here still, but for now we keep this here.
        down_write(&hidp_session_sem);
  
        s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-@@ -856,6 +971,7 @@ int hidp_add_connection(struct hidp_conn
+@@ -859,6 +974,7 @@ int hidp_add_connection(struct hidp_conn
        session->flags   = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID);
        session->idle_to = req->idle_to;
  
@@ -331,7 +331,7 @@ here still, but for now we keep this here.
        if (req->rd_size > 0) {
                err = hidp_setup_hid(session, req);
                if (err && err != -ENODEV)
-@@ -867,6 +983,16 @@ int hidp_add_connection(struct hidp_conn
+@@ -870,6 +986,16 @@ int hidp_add_connection(struct hidp_conn
                if (err < 0)
                        goto purge;
        }
@@ -348,7 +348,7 @@ here still, but for now we keep this here.
  
        __hidp_link_session(session);
  
-@@ -898,6 +1024,7 @@ unlink:
+@@ -901,6 +1027,7 @@ unlink:
                session->input = NULL;
        }
  
@@ -356,7 +356,7 @@ here still, but for now we keep this here.
        if (session->hid) {
                hid_destroy_device(session->hid);
                session->hid = NULL;
-@@ -909,10 +1036,15 @@ unlink:
+@@ -912,10 +1039,15 @@ unlink:
  purge:
        skb_queue_purge(&session->ctrl_transmit);
        skb_queue_purge(&session->intr_transmit);
@@ -372,7 +372,7 @@ here still, but for now we keep this here.
        input_free_device(session->input);
        kfree(session);
        return err;
-@@ -1002,6 +1134,7 @@ int hidp_get_conninfo(struct hidp_connin
+@@ -1005,6 +1137,7 @@ int hidp_get_conninfo(struct hidp_connin
        return err;
  }
  
@@ -380,7 +380,7 @@ here still, but for now we keep this here.
  static const struct hid_device_id hidp_table[] = {
        { HID_BLUETOOTH_DEVICE(HID_ANY_ID, HID_ANY_ID) },
        { }
-@@ -1011,6 +1144,7 @@ static struct hid_driver hidp_driver = {
+@@ -1014,6 +1147,7 @@ static struct hid_driver hidp_driver = {
        .name = "generic-bluetooth",
        .id_table = hidp_table,
  };
@@ -388,7 +388,7 @@ here still, but for now we keep this here.
  
  static int __init hidp_init(void)
  {
-@@ -1020,11 +1154,14 @@ static int __init hidp_init(void)
+@@ -1023,11 +1157,14 @@ static int __init hidp_init(void)
  
        BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
  
@@ -403,7 +403,7 @@ here still, but for now we keep this here.
        if (ret)
                goto err_drv;
  
-@@ -1032,13 +1169,16 @@ static int __init hidp_init(void)
+@@ -1035,13 +1172,16 @@ static int __init hidp_init(void)
  err_drv:
        hid_unregister_driver(&hidp_driver);
  err:
@@ -549,7 +549,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/l2cap.c
 +++ b/net/bluetooth/l2cap.c
-@@ -957,8 +957,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -982,8 +982,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -562,7 +562,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -970,7 +974,11 @@ static int l2cap_sock_create(struct net
+@@ -995,7 +999,11 @@ static int l2cap_sock_create(struct net
                        sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  
@@ -574,7 +574,7 @@ here still, but for now we keep this here.
                return -EPERM;
  
        sock->ops = &l2cap_sock_ops;
-@@ -2042,7 +2050,11 @@ static int l2cap_sock_setsockopt_old(str
+@@ -2043,7 +2051,11 @@ static int l2cap_sock_setsockopt_old(str
        return err;
  }
  

diff --git a/patches/21-capi-proc_fops.patch b/patches/21-capi-proc_fops.patch
index 2f2ca7de5e7b3f960037965ea15273ddfaec7c82..9cd9f4cd0966fe0979ec17d654450ff7e8b9faaf 100644 (file)
--- a/patches/21-capi-proc_fops.patch
+++ b/patches/21-capi-proc_fops.patch
@@ -14,7 +14,7 @@ proc_fops: convert drivers/isdn/ to seq_file
  #include <linux/types.h>
  #include <linux/errno.h>
  #include <linux/kernel.h>
-@@ -521,6 +523,7 @@ static char *cmtp_procinfo(struct capi_c
+@@ -522,6 +524,7 @@ static char *cmtp_procinfo(struct capi_c
        return "CAPI Message Transport Protocol";
  }
  
@@ -22,7 +22,7 @@ proc_fops: convert drivers/isdn/ to seq_file
  static int cmtp_proc_show(struct seq_file *m, void *v)
  {
        struct capi_ctr *ctrl = m->private;
-@@ -553,6 +556,36 @@ static const struct file_operations cmtp
+@@ -554,6 +557,36 @@ static const struct file_operations cmtp
        .release        = single_release,
  };
  
@@ -59,7 +59,7 @@ proc_fops: convert drivers/isdn/ to seq_file
  int cmtp_attach_device(struct cmtp_session *session)
  {
        unsigned char buf[4];
-@@ -591,7 +624,11 @@ int cmtp_attach_device(struct cmtp_sessi
+@@ -592,7 +625,11 @@ int cmtp_attach_device(struct cmtp_sessi
        session->ctrl.send_message  = cmtp_send_message;
  
        session->ctrl.procinfo      = cmtp_procinfo;

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 95bab2e49a4c6814755ade4901d6ceb5a1620897..0aafb1b3427431ceb0f5130d9c0593c280274863 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -162,7 +162,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -331,20 +331,42 @@ ath5k_bss_info_changed(struct ieee80211_
+@@ -340,20 +340,42 @@ ath5k_bss_info_changed(struct ieee80211_
  
  static u64
  ath5k_prepare_multicast(struct ieee80211_hw *hw,
@@ -205,7 +205,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
                pos &= 0x3f;
                mfilt[pos / 32] |= (1 << (pos % 32));
-@@ -353,6 +375,9 @@ ath5k_prepare_multicast(struct ieee80211
+@@ -362,6 +384,9 @@ ath5k_prepare_multicast(struct ieee80211
                * neet to inform below to not reset the mcast */
                /* ath5k_hw_set_mcast_filterindex(ah,
                 *      ha->addr[5]); */
@@ -217,7 +217,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        return ((u64)(mfilt[1]) << 32) | mfilt[0];
 --- a/drivers/net/wireless/ath/carl9170/main.c
 +++ b/drivers/net/wireless/ath/carl9170/main.c
-@@ -840,17 +840,35 @@ out:
+@@ -847,17 +847,35 @@ out:
        return err;
  }
  
@@ -331,7 +331,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
 --- a/drivers/net/wireless/mwl8k.c
 +++ b/drivers/net/wireless/mwl8k.c
-@@ -2005,15 +2005,21 @@ struct mwl8k_cmd_mac_multicast_adr {
+@@ -2152,15 +2152,21 @@ struct mwl8k_cmd_mac_multicast_adr {
  
  static struct mwl8k_cmd_pkt *
  __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
@@ -353,7 +353,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
        if (allmulti || mc_count > priv->num_mcaddrs) {
                allmulti = 1;
-@@ -2034,13 +2040,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
+@@ -2181,13 +2187,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
        if (allmulti) {
                cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST);
        } else if (mc_count) {
@@ -381,7 +381,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                }
        }
  
-@@ -3699,7 +3719,11 @@ mwl8k_bss_info_changed(struct ieee80211_
+@@ -4116,7 +4136,11 @@ mwl8k_bss_info_changed(struct ieee80211_
  }
  
  static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
@@ -393,7 +393,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  {
        struct mwl8k_cmd_pkt *cmd;
  
-@@ -3710,7 +3734,11 @@ static u64 mwl8k_prepare_multicast(struc
+@@ -4127,7 +4151,11 @@ static u64 mwl8k_prepare_multicast(struc
         * we'll end up throwing this packet away and creating a new
         * one in mwl8k_configure_filter().
         */
@@ -405,7 +405,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
        return (unsigned long)cmd;
  }
-@@ -3832,7 +3860,11 @@ static void mwl8k_configure_filter(struc
+@@ -4249,7 +4277,11 @@ static void mwl8k_configure_filter(struc
         */
        if (*total_flags & FIF_ALLMULTI) {
                kfree(cmd);
@@ -501,7 +501,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  static void rtl8187_configure_filter(struct ieee80211_hw *dev,
 --- a/drivers/net/wireless/wl12xx/main.c
 +++ b/drivers/net/wireless/wl12xx/main.c
-@@ -1501,11 +1501,20 @@ struct wl1271_filter_params {
+@@ -1573,11 +1573,20 @@ struct wl1271_filter_params {
        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };
  
@@ -522,7 +522,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        struct wl1271 *wl = hw->priv;
  
        if (unlikely(wl->state == WL1271_STATE_OFF))
-@@ -1518,16 +1527,40 @@ static u64 wl1271_op_prepare_multicast(s
+@@ -1590,16 +1599,40 @@ static u64 wl1271_op_prepare_multicast(s
        }
  
        /* update multicast filtering parameters */
@@ -616,7 +616,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        }
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -1770,7 +1770,11 @@ struct ieee80211_ops {
+@@ -1802,7 +1802,11 @@ struct ieee80211_ops {
                                 struct ieee80211_bss_conf *info,
                                 u32 changed);
        u64 (*prepare_multicast)(struct ieee80211_hw *hw,
@@ -721,7 +721,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -75,7 +75,11 @@ void ieee80211_configure_filter(struct i
+@@ -77,7 +77,11 @@ void ieee80211_configure_filter(struct i
        spin_lock_bh(&local->filter_lock);
        changed_flags = local->filter_flags ^ new_flags;
  
@@ -733,7 +733,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        spin_unlock_bh(&local->filter_lock);
  
        /* be a bit nasty */
-@@ -559,9 +563,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -562,9 +566,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
        local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
  
        INIT_LIST_HEAD(&local->interfaces);

diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index a378b37521000443ebe4430e04bcb2c8eddbd9f0..0f08735b4de2be360b25db9a21fe776c4296e06e 100644 (file)
--- a/patches/30-bridge-port.patch
+++ b/patches/30-bridge-port.patch
@@ -23,7 +23,7 @@ compat-wireless.
 
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -785,7 +785,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -796,7 +796,7 @@ int cfg80211_change_iface(struct cfg8021
                return -EOPNOTSUPP;
  
        /* if it's part of a bridge, reject changing type to station/ibss */

diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch
index 91e23e30041411af7741206705f0fab06a1609df..704c7c66819932423df97becc31cc523bc6870aa 100644 (file)
--- a/patches/31-backport-sk_add_backlog.patch
+++ b/patches/31-backport-sk_add_backlog.patch
@@ -9,7 +9,7 @@ backlog.
 
 --- a/net/bluetooth/l2cap.c
 +++ b/net/bluetooth/l2cap.c
-@@ -4418,8 +4418,12 @@ static inline int l2cap_data_channel(str
+@@ -4449,8 +4449,12 @@ static inline int l2cap_data_channel(str
                if (!sock_owned_by_user(sk)) {
                        l2cap_ertm_data_rcv(sk, skb);
                } else {

diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch
index 90d241245a8098d8b6c0ab54031e4b8e7cc36dd6..06e580df9989b04a7a15557c4d9947e1eff59ddc 100644 (file)
--- a/patches/36-workqueue.patch
+++ b/patches/36-workqueue.patch
@@ -2,7 +2,7 @@ Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a
 
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -773,7 +773,11 @@ int ieee80211_register_hw(struct ieee802
+@@ -787,7 +787,11 @@ int ieee80211_register_hw(struct ieee802
                hw->queues = IEEE80211_MAX_QUEUES;
  
        local->workqueue =
@@ -14,7 +14,7 @@ Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a
        if (!local->workqueue) {
                result = -ENOMEM;
                goto fail_workqueue;
-@@ -988,6 +992,10 @@ static void __exit ieee80211_exit(void)
+@@ -1002,6 +1006,10 @@ static void __exit ieee80211_exit(void)
        rc80211_minstrel_ht_exit();
        rc80211_minstrel_exit();
  

diff --git a/patches/37-vsnprintk.patch b/patches/37-vsnprintk.patch
index 93d1a00872c3c5d924fc57ca83d2734f7e994556..b192713b756d34a225f0f64f7b2909d325ad0b13 100644 (file)
--- a/patches/37-vsnprintk.patch
+++ b/patches/37-vsnprintk.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
-index c325202..e3e60d4 100644
 --- a/drivers/net/wireless/ath/main.c
 +++ b/drivers/net/wireless/ath/main.c
 @@ -60,16 +60,23 @@ EXPORT_SYMBOL(ath_rxbuf_alloc);