compat-wireless: update patches

Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index f28dd127fcfd53118af0414a8abfabf00817b333..cbbf3fda118a3a482d45ace821b4832e1e91608c 100644 (file)
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -186,7 +186,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6112,7 +6112,7 @@ static struct net_device *ipw2100_alloc_
+@@ -6114,7 +6114,7 @@ static struct net_device *ipw2100_alloc_
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -197,7 +197,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
-@@ -11670,7 +11670,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11673,7 +11673,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;
@@ -206,7 +206,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);
-@@ -11809,7 +11809,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11812,7 +11812,7 @@ static int __devinit ipw_pci_probe(struc
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -336,7 +336,7 @@ without creating a headache on maintenance of the pathes.
  }
 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
 +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-@@ -2232,7 +2232,7 @@ static int atl1e_init_netdev(struct net_
+@@ -2231,7 +2231,7 @@ static int atl1e_init_netdev(struct net_
        pci_set_drvdata(pdev, netdev);
  
        netdev->irq  = pdev->irq;
@@ -347,7 +347,7 @@ without creating a headache on maintenance of the pathes.
        atl1e_set_ethtool_ops(netdev);
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2618,7 +2618,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2617,7 +2617,7 @@ static int atl1c_init_netdev(struct net_
        pci_set_drvdata(pdev, netdev);
  
        netdev->irq  = pdev->irq;
@@ -358,7 +358,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2969,7 +2969,7 @@ static int __devinit atl1_probe(struct p
+@@ -2968,7 +2968,7 @@ static int __devinit atl1_probe(struct p
        adapter->mii.phy_id_mask = 0x1f;
        adapter->mii.reg_num_mask = 0x1f;
  

diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index 4cf35a2632a6e4bf12379d1df7df8478bb8e0b01..af1e888f9a4bee44971395b7fb1c5ecc4653a4ae 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
-@@ -4809,7 +4809,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -4905,7 +4905,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/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index bea44d2459e3f36ce211540143956826e931c871..7df41f64bc768c98ac923fc1734526468e827f19 100644 (file)
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -6,7 +6,7 @@ thread in process context as well.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -4171,8 +4171,13 @@ redo:
+@@ -4174,8 +4174,13 @@ redo:
        if (b43_bus_host_is_sdio(dev->dev)) {
                b43_sdio_free_irq(dev);
        } else {
@@ -20,7 +20,7 @@ thread in process context as well.
        }
        mutex_lock(&wl->mutex);
        dev = wl->current_dev;
-@@ -4212,9 +4217,17 @@ static int b43_wireless_core_start(struc
+@@ -4215,9 +4220,17 @@ static int b43_wireless_core_start(struc
                        goto out;
                }
        } else {
@@ -38,7 +38,7 @@ thread in process context as well.
                if (err) {
                        b43err(dev->wl, "Cannot request IRQ-%d\n",
                               dev->dev->irq);
-@@ -5003,6 +5016,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5006,6 +5019,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {
@@ -51,7 +51,7 @@ thread in process context as well.
        b43_release_firmware(dev);
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -803,6 +803,9 @@ struct b43_wldev {
+@@ -805,6 +805,9 @@ struct b43_wldev {
        unsigned int tx_count;
        unsigned int rx_count;
  #endif
@@ -122,7 +122,7 @@ thread in process context as well.
        return 0;
 --- a/drivers/net/wireless/wl12xx/wl12xx.h
 +++ b/drivers/net/wireless/wl12xx/wl12xx.h
-@@ -623,6 +623,10 @@ struct wl1271 {
+@@ -626,6 +626,10 @@ struct wl1271 {
  
        /* number of currently active RX BA sessions */
        int ba_rx_session_count;

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 48d765f7c1b085f56b4eff41f0b17f9e02ea1aca..803e7e84144a6b898e3f2db0c0d640827f5411bf 100644 (file)
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -9,7 +9,7 @@ calls on compat code with only slight modifications.
 
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2898,6 +2898,9 @@ static struct pci_error_handlers atl1c_e
+@@ -2897,6 +2897,9 @@ static struct pci_error_handlers atl1c_e
  
  static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
  
@@ -19,7 +19,7 @@ calls on compat code with only slight modifications.
  static struct pci_driver atl1c_driver = {
        .name     = atl1c_driver_name,
        .id_table = atl1c_pci_tbl,
-@@ -2905,7 +2908,12 @@ static struct pci_driver atl1c_driver =
+@@ -2904,7 +2907,12 @@ static struct pci_driver atl1c_driver =
        .remove   = __devexit_p(atl1c_remove),
        .shutdown = atl1c_shutdown,
        .err_handler = &atl1c_err_handler,
@@ -34,7 +34,7 @@ calls on compat code with only slight modifications.
  /*
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2836,6 +2836,9 @@ static int atl1_resume(struct device *de
+@@ -2835,6 +2835,9 @@ static int atl1_resume(struct device *de
        return 0;
  }
  
@@ -44,7 +44,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
  #define ATL1_PM_OPS   (&atl1_pm_ops)
  
-@@ -3105,7 +3108,12 @@ static struct pci_driver atl1_driver = {
+@@ -3104,7 +3107,12 @@ static struct pci_driver atl1_driver = {
        .probe = atl1_probe,
        .remove = __devexit_p(atl1_remove),
        .shutdown = atl1_shutdown,
@@ -84,7 +84,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
-@@ -354,14 +354,10 @@ static int ath_pci_resume(struct device
+@@ -352,14 +352,10 @@ static int ath_pci_resume(struct device
        return 0;
  }
  
@@ -103,7 +103,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS  (&ath9k_pm_ops)
  
-@@ -379,7 +375,12 @@ static struct pci_driver ath_pci_driver
+@@ -377,7 +373,12 @@ static struct pci_driver ath_pci_driver
        .id_table   = ath_pci_id_table,
        .probe      = ath_pci_probe,
        .remove     = ath_pci_remove,
@@ -219,7 +219,7 @@ calls on compat code with only slight modifications.
  static int __init iwl4965_init(void)
 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
-@@ -532,6 +532,9 @@ static int iwl_pci_resume(struct device
+@@ -537,6 +537,9 @@ static int iwl_pci_resume(struct device
  
  static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
  
@@ -229,7 +229,7 @@ calls on compat code with only slight modifications.
  #define IWL_PM_OPS    (&iwl_dev_pm_ops)
  
  #else
-@@ -545,7 +548,12 @@ static struct pci_driver iwl_pci_driver
+@@ -550,7 +553,12 @@ static struct pci_driver iwl_pci_driver
        .id_table = iwl_hw_card_ids,
        .probe = iwl_pci_probe,
        .remove = __devexit_p(iwl_pci_remove),

diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch
index 1b9154bf5891bd98df8a281bade0dcaf66085bcf..82e3cabbcfe0b1e80b3232b2eacc451755bfde9c 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
-@@ -6115,7 +6115,11 @@ static struct net_device *ipw2100_alloc_
+@@ -6117,7 +6117,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 0f5b588d46126da27bda2b8a7c0344767be7e0de..1f7487c836d1c9abfc2caee56a9a1b0582e01b97 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
-@@ -2974,7 +2974,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -2992,7 +2992,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 b6d251a49a6d706634f67fc137ede247cd51bd9c..139e35bd7fb6f3e1f5abcdd0197cf2bf4d814469 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -94,7 +94,7 @@ here still, but for now we keep this here.
        wake_up_process(session->task);
 --- a/net/bluetooth/hci_sock.c
 +++ b/net/bluetooth/hci_sock.c
-@@ -547,7 +547,11 @@ drop:
+@@ -561,7 +561,11 @@ drop:
        goto done;
  }
  
@@ -106,7 +106,7 @@ here still, but for now we keep this here.
  {
        struct hci_ufilter uf = { .opcode = 0 };
        struct sock *sk = sock->sk;
-@@ -702,8 +706,12 @@ static struct proto hci_sk_proto = {
+@@ -716,8 +720,12 @@ static struct proto hci_sk_proto = {
        .obj_size       = sizeof(struct hci_pinfo)
  };
  

diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch
index 5c6090bc62afcce71c6af29867779ccdf449096c..7b5a8d155419eb31ecba723113979def33fc0375 100644 (file)
--- a/patches/17-netdev-queue.patch
+++ b/patches/17-netdev-queue.patch
@@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was:
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1230,6 +1230,7 @@ void ieee80211_if_remove(struct ieee8021
+@@ -1233,6 +1233,7 @@ void ieee80211_if_remove(struct ieee8021
   * Remove all interfaces, may only be called at hardware unregistration
   * time because it doesn't do RCU-safe list removals.
   */
@@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was:
  void ieee80211_remove_interfaces(struct ieee80211_local *local)
  {
        struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1247,6 +1248,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1253,6 +1254,22 @@ void ieee80211_remove_interfaces(struct
        unregister_netdevice_many(&unreg_list);
        list_del(&unreg_list);
  }

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 1a22119d5df42f459a7c50bc6ee1d9804df39cab..7d1a7e3e89324e2949ed8560c8226abcd9103726 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -536,7 +536,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
-@@ -2385,11 +2385,20 @@ struct wl1271_filter_params {
+@@ -2431,11 +2431,20 @@ struct wl1271_filter_params {
        u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };
  
@@ -557,7 +557,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        struct wl1271 *wl = hw->priv;
  
        if (unlikely(wl->state == WL1271_STATE_OFF))
-@@ -2402,16 +2411,40 @@ static u64 wl1271_op_prepare_multicast(s
+@@ -2448,16 +2457,40 @@ static u64 wl1271_op_prepare_multicast(s
        }
  
        /* update multicast filtering parameters */
@@ -637,7 +637,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        return hash.low | ((u64)hash.high << 32);
 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
-@@ -225,7 +225,11 @@ static void _brcmf_set_multicast_list(st
+@@ -213,7 +213,11 @@ static void _brcmf_set_multicast_list(st
        netdev_for_each_mc_addr(ha, dev) {
                if (!cnt)
                        break;
@@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        }
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -1938,7 +1938,11 @@ struct ieee80211_ops {
+@@ -1956,7 +1956,11 @@ struct ieee80211_ops {
                               enum ieee80211_tx_sync_type type);
  
        u64 (*prepare_multicast)(struct ieee80211_hw *hw,
@@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -773,7 +773,12 @@ struct ieee80211_local {
+@@ -775,7 +775,12 @@ struct ieee80211_local {
        struct work_struct recalc_smps;
  
        /* aggregated multicast list */

diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index ef14f08bd850d24b39a516e2063e0f390b08027f..cb2fbedf6fe857fd88169295dfd349bcce2db890 100644 (file)
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -86,7 +86,7 @@ suspend and resume that are not backported.
  
 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
 +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-@@ -49,7 +49,7 @@ static int brcmf_ops_sdio_probe(struct s
+@@ -45,7 +45,7 @@ static int brcmf_ops_sdio_probe(struct s
                                const struct sdio_device_id *id);
  static void brcmf_ops_sdio_remove(struct sdio_func *func);
  
@@ -95,7 +95,7 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev);
  static int brcmf_sdio_resume(struct device *dev);
  #endif /* CONFIG_PM */
-@@ -62,7 +62,7 @@ static const struct sdio_device_id brcmf
+@@ -58,7 +58,7 @@ static const struct sdio_device_id brcmf
        { /* end: all zeroes */ },
  };
  
@@ -104,7 +104,7 @@ suspend and resume that are not backported.
  static const struct dev_pm_ops brcmf_sdio_pm_ops = {
        .suspend        = brcmf_sdio_suspend,
        .resume         = brcmf_sdio_resume,
-@@ -74,7 +74,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -70,7 +70,7 @@ static struct sdio_driver brcmf_sdmmc_dr
        .remove = brcmf_ops_sdio_remove,
        .name = "brcmfmac",
        .id_table = brcmf_sdmmc_ids,
@@ -113,7 +113,7 @@ suspend and resume that are not backported.
        .drv = {
                .pm = &brcmf_sdio_pm_ops,
        },
-@@ -640,7 +640,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -623,7 +623,7 @@ static void brcmf_ops_sdio_remove(struct
  }
  
  

diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index d5574027c4bc69631ef738401442d974f442d744..0a888b8ad1f88f95b6c5eebd1e13bd8280c2b5f2 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
-@@ -802,7 +802,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -801,7 +801,7 @@ int cfg80211_change_iface(struct cfg8021
                return -EOPNOTSUPP;
  
        /* if it's part of a bridge, reject changing type to station/ibss */
@@ -34,7 +34,7 @@ compat-wireless.
             ntype == NL80211_IFTYPE_P2P_CLIENT))
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1524,7 +1524,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -1539,7 +1539,7 @@ static int nl80211_valid_4addr(struct cf
                               enum nl80211_iftype iftype)
  {
        if (!use_4addr) {

diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch
index 856b2b3ac5760e379a9e1a220e1bc13987ad4f53..41e665ca37d8891eca6ffdcc17d284fbe62ba1ff 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_core.c
 +++ b/net/bluetooth/l2cap_core.c
-@@ -3737,8 +3737,12 @@ static inline int l2cap_data_channel(str
+@@ -3742,8 +3742,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/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch
index 64ecc9ce545b58bac3af3312446822636f3fb671..e9ce63a908487a94568b11669f496d0d2e9f162a 100644 (file)
--- a/patches/38-led-max-brightness.patch
+++ b/patches/38-led-max-brightness.patch
@@ -12,7 +12,7 @@
        case IWL_LED_DEFAULT:
 --- a/drivers/net/wireless/iwlwifi/iwl-led.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-led.c
-@@ -184,7 +184,9 @@ void iwl_leds_init(struct iwl_priv *priv
+@@ -185,7 +185,9 @@ void iwl_leds_init(struct iwl_priv *priv
                                   wiphy_name(priv->hw->wiphy));
        priv->led.brightness_set = iwl_led_brightness_set;
        priv->led.blink_set = iwl_led_blink_set;

diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch
index a39b6346bcd6761d0ae9cb46e60b98d4cc125805..a9c2c7a95956f4910bc432d31762f96600fc1bdc 100644 (file)
--- a/patches/39-remove_blink_set.patch
+++ b/patches/39-remove_blink_set.patch
@@ -28,7 +28,7 @@
  #endif
 --- a/drivers/net/wireless/iwlwifi/iwl-led.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-led.c
-@@ -163,6 +163,7 @@ static void iwl_led_brightness_set(struc
+@@ -164,6 +164,7 @@ static void iwl_led_brightness_set(struc
        iwl_led_cmd(priv, on, 0);
  }
  
@@ -36,7 +36,7 @@
  static int iwl_led_blink_set(struct led_classdev *led_cdev,
                             unsigned long *delay_on,
                             unsigned long *delay_off)
-@@ -171,6 +172,7 @@ static int iwl_led_blink_set(struct led_
+@@ -172,6 +173,7 @@ static int iwl_led_blink_set(struct led_
  
        return iwl_led_cmd(priv, *delay_on, *delay_off);
  }
@@ -44,7 +44,7 @@
  
  void iwl_leds_init(struct iwl_priv *priv)
  {
-@@ -183,7 +185,9 @@ void iwl_leds_init(struct iwl_priv *priv
+@@ -184,7 +186,9 @@ void iwl_leds_init(struct iwl_priv *priv
        priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
                                   wiphy_name(priv->hw->wiphy));
        priv->led.brightness_set = iwl_led_brightness_set;

diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch
index ff78a4cb946cd49da027264459dc14e8cdd0e351..f9affad1e5231062bff7bfd7b68ec29ef6a01ce2 100644 (file)
--- a/patches/40-netdev-hw-features.patch
+++ b/patches/40-netdev-hw-features.patch
@@ -80,7 +80,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
                atl1c_up(adapter);
                clear_bit(__AT_RESETTING, &adapter->flags);
                if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) {
-@@ -2606,8 +2619,10 @@ static const struct net_device_ops atl1c
+@@ -2605,8 +2618,10 @@ static const struct net_device_ops atl1c
        .ndo_set_mac_address    = atl1c_set_mac_addr,
        .ndo_set_rx_mode        = atl1c_set_multi,
        .ndo_change_mtu         = atl1c_change_mtu,
@@ -91,7 +91,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
        .ndo_do_ioctl           = atl1c_ioctl,
        .ndo_tx_timeout         = atl1c_tx_timeout,
        .ndo_get_stats          = atl1c_get_stats,
-@@ -2627,6 +2642,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2626,6 +2641,7 @@ static int atl1c_init_netdev(struct net_
        atl1c_set_ethtool_ops(netdev);
  
        /* TODO: add when ready */
@@ -99,7 +99,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
        netdev->hw_features =   NETIF_F_SG         |
                                NETIF_F_HW_CSUM    |
                                NETIF_F_HW_VLAN_RX |
-@@ -2634,6 +2650,14 @@ static int atl1c_init_netdev(struct net_
+@@ -2633,6 +2649,14 @@ static int atl1c_init_netdev(struct net_
                                NETIF_F_TSO6;
        netdev->features =      netdev->hw_features |
                                NETIF_F_HW_VLAN_TX;
@@ -146,7 +146,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
  /*
   * atl1e_change_mtu - Change the Maximum Transfer Unit
-@@ -1949,7 +1951,11 @@ void atl1e_down(struct atl1e_adapter *ad
+@@ -1948,7 +1950,11 @@ void atl1e_down(struct atl1e_adapter *ad
         * reschedule our watchdog timer */
        set_bit(__AT_DOWN, &adapter->flags);
  
@@ -158,7 +158,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
        /* reset MAC to disable all RX/TX */
        atl1e_reset_hw(&adapter->hw);
-@@ -2219,8 +2225,10 @@ static const struct net_device_ops atl1e
+@@ -2218,8 +2224,10 @@ static const struct net_device_ops atl1e
        .ndo_set_rx_mode        = atl1e_set_multi,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_set_mac_address    = atl1e_set_mac_addr,
@@ -169,7 +169,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
        .ndo_change_mtu         = atl1e_change_mtu,
        .ndo_do_ioctl           = atl1e_ioctl,
        .ndo_tx_timeout         = atl1e_tx_timeout,
-@@ -2241,10 +2249,15 @@ static int atl1e_init_netdev(struct net_
+@@ -2240,10 +2248,15 @@ static int atl1e_init_netdev(struct net_
        netdev->watchdog_timeo = AT_TX_WATCHDOG;
        atl1e_set_ethtool_ops(netdev);
  
@@ -187,7 +187,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  }
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2876,8 +2876,10 @@ static const struct net_device_ops atl1_
+@@ -2875,8 +2875,10 @@ static const struct net_device_ops atl1_
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_set_mac_address    = atl1_set_mac,
        .ndo_change_mtu         = atl1_change_mtu,
@@ -198,7 +198,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
        .ndo_do_ioctl           = atlx_ioctl,
        .ndo_tx_timeout         = atlx_tx_timeout,
  #ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -2987,11 +2989,13 @@ static int __devinit atl1_probe(struct p
+@@ -2986,11 +2988,13 @@ static int __devinit atl1_probe(struct p
        netdev->features |= NETIF_F_SG;
        netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
  
@@ -212,7 +212,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
        /*
         * patch for some L1 of old version,
-@@ -3608,6 +3612,14 @@ static int atl1_set_pauseparam(struct ne
+@@ -3607,6 +3611,14 @@ static int atl1_set_pauseparam(struct ne
        return 0;
  }
  
@@ -227,7 +227,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static void atl1_get_strings(struct net_device *netdev, u32 stringset,
        u8 *data)
  {
-@@ -3680,4 +3692,10 @@ static const struct ethtool_ops atl1_eth
+@@ -3679,4 +3691,10 @@ static const struct ethtool_ops atl1_eth
        .nway_reset             = atl1_nway_reset,
        .get_ethtool_stats      = atl1_get_ethtool_stats,
        .get_sset_count         = atl1_get_sset_count,

diff --git a/patches/41-no-kfree-rcu.patch b/patches/41-no-kfree-rcu.patch
index c18b50d5e286b01ecfbd8e20f32648f7c8ca128b..3a49d28b729b52be34d5f7affe2e24b47491354e 100644 (file)
--- a/patches/41-no-kfree-rcu.patch
+++ b/patches/41-no-kfree-rcu.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/agg-tx.c
 +++ b/net/mac80211/agg-tx.c
-@@ -144,6 +144,16 @@ void ieee80211_assign_tid_tx(struct sta_
+@@ -142,6 +142,16 @@ void ieee80211_assign_tid_tx(struct sta_
        rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], tid_tx);
  }
  
@@ -17,7 +17,7 @@
  int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                    enum ieee80211_back_parties initiator,
                                    bool tx)
-@@ -166,7 +176,11 @@ int ___ieee80211_stop_tx_ba_session(stru
+@@ -164,7 +174,11 @@ int ___ieee80211_stop_tx_ba_session(stru
                /* not even started yet! */
                ieee80211_assign_tid_tx(sta, tid, NULL);
                spin_unlock_bh(&sta->lock);
@@ -29,7 +29,7 @@
                return 0;
        }
  
-@@ -325,7 +339,11 @@ void ieee80211_tx_ba_session_handle_star
+@@ -323,7 +337,11 @@ void ieee80211_tx_ba_session_handle_star
                spin_unlock_bh(&sta->lock);
  
                ieee80211_wake_queue_agg(local, tid);
@@ -41,7 +41,7 @@
                return;
        }
  
-@@ -710,7 +728,11 @@ void ieee80211_stop_tx_ba_cb(struct ieee
+@@ -699,7 +717,11 @@ void ieee80211_stop_tx_ba_cb(struct ieee
  
        ieee80211_agg_splice_finish(local, tid);
  

diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch
index 9eb999b1027d5d714b1e23c0a1be716508ecb0d1..371c4d746d70e6a6ff909d5766cb555a117b7327 100644 (file)
--- a/patches/42-netlink_seq.patch
+++ b/patches/42-netlink_seq.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -3889,7 +3889,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -3985,7 +3985,9 @@ static int nl80211_dump_scan(struct sk_b
        spin_lock_bh(&rdev->bss_lock);
        cfg80211_bss_expire(rdev);