compat-drivers: refresh patches for next-20121211

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
index e12c396d3044ee7383d0abd8127d3595785ab2ac..e6a85c69eb80d1585a8fef8bc999f31b20b2ebd7 100644 (file)
--- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch
+++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
@@ -97,7 +97,7 @@ not < 3.3.0.
  #include <drm/drmP.h>
  
  #include "nouveau_drm.h"
-@@ -228,4 +229,4 @@ fail_detach:
+@@ -224,4 +225,4 @@ fail_detach:
        dma_buf_detach(dma_buf, attach);
        return ERR_PTR(ret);
  }
@@ -236,7 +236,7 @@ not < 3.3.0.
        dev = drm->dev;
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -591,7 +591,10 @@ driver = {
+@@ -622,7 +622,10 @@ driver = {
        .driver_features =
                DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
                DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
@@ -248,7 +248,7 @@ not < 3.3.0.
  
        .load = nouveau_drm_load,
        .unload = nouveau_drm_unload,
-@@ -612,10 +615,12 @@ driver = {
+@@ -643,10 +646,12 @@ driver = {
        .ioctls = nouveau_ioctls,
        .fops = &nouveau_driver_fops,
  
@@ -323,7 +323,7 @@ not < 3.3.0.
  
  static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
  static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3778,8 +3780,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3773,8 +3775,10 @@ void i915_gem_free_object(struct drm_gem
  
        BUG_ON(obj->pages);
  

diff --git a/patches/collateral-evolutions/drm/06-rename-config-options.patch b/patches/collateral-evolutions/drm/06-rename-config-options.patch
index 9ad2f89b4220af9892fcb0489b15c5b390d6f7e4..5c5996bb744a3f2fbd0147a248fd5aa4c592f968 100644 (file)
--- a/patches/collateral-evolutions/drm/06-rename-config-options.patch
+++ b/patches/collateral-evolutions/drm/06-rename-config-options.patch
@@ -142,7 +142,7 @@
 +obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200.o
 --- a/drivers/gpu/drm/nouveau/Makefile
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -187,6 +187,6 @@ nouveau-y += nouveau_mem.o
+@@ -217,6 +217,6 @@ nouveau-y += nouveau_mem.o
  # other random bits
  nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
  nouveau-$(CONFIG_ACPI) += nouveau_acpi.o

diff --git a/patches/collateral-evolutions/drm/07-intel-gtt.patch b/patches/collateral-evolutions/drm/07-intel-gtt.patch
index ec026e04b4ddf8a91abc57a20d4d8a0df39c80a5..5d4b327035c8fbfe4e8f22c11be0e16fe4f67c89 100644 (file)
--- a/patches/collateral-evolutions/drm/07-intel-gtt.patch
+++ b/patches/collateral-evolutions/drm/07-intel-gtt.patch
@@ -24,7 +24,7 @@ Date:   Thu Jun 7 15:56:03 2012 +0200
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3911,9 +3911,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3906,9 +3906,14 @@ i915_gem_init_hw(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
  

diff --git a/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch b/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch
index 1915593777ed1f2638bf835e185b5de057a81020..48fa00c6e04540d55a16ce2522f85d9c422e24e2 100644 (file)
--- a/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch
+++ b/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch
@@ -27,7 +27,7 @@ Date:   Mon Jun 27 16:18:19 2011 -0700
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1650,7 +1650,14 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1639,7 +1639,14 @@ i915_gem_object_truncate(struct drm_i915
         * backing pages, *now*.
         */
        inode = obj->base.filp->f_path.dentry->d_inode;

diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch
index eb0c5a4a6cdf95600344ef5aaeca7a078e0e104c..c1665c71ed1adf48a4659c2aec98e91996422eb5 100644 (file)
--- a/patches/collateral-evolutions/network/0001-netdev_ops.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch
@@ -82,7 +82,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        retval = rndis_set_oid(usbdev,
 --- a/drivers/net/ethernet/broadcom/b44.c
 +++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -2175,7 +2175,7 @@ static int __devinit b44_init_one(struct
+@@ -2175,7 +2175,7 @@ static int b44_init_one(struct ssb_devic
        bp->rx_pending = B44_DEF_RX_RING_PENDING;
        bp->tx_pending = B44_DEF_TX_RING_PENDING;
  
@@ -104,7 +104,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11690,7 +11690,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11688,7 +11688,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;
@@ -113,7 +113,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  
        priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
        SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11828,7 +11828,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11826,7 +11826,7 @@ static int ipw_pci_probe(struct pci_dev
        priv->ieee->perfect_rssi = -20;
        priv->ieee->worst_rssi = -85;
  
@@ -146,7 +146,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1601,7 +1601,7 @@ static const struct net_device_ops hwsim
+@@ -1606,7 +1606,7 @@ static const struct net_device_ops hwsim
  
  static void hwsim_mon_setup(struct net_device *dev)
  {
@@ -201,7 +201,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -3010,7 +3010,7 @@ static int __devinit atl1_probe(struct p
+@@ -3009,7 +3009,7 @@ static int atl1_probe(struct pci_dev *pd
        adapter->mii.phy_id_mask = 0x1f;
        adapter->mii.reg_num_mask = 0x1f;
  
@@ -212,7 +212,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  
 --- a/drivers/net/ethernet/atheros/atlx/atl2.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
-@@ -1400,7 +1400,7 @@ static int __devinit atl2_probe(struct p
+@@ -1399,7 +1399,7 @@ static int atl2_probe(struct pci_dev *pd
  
        atl2_setup_pcicmd(pdev);
  
@@ -223,7 +223,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1008,7 +1008,7 @@ static void ieee80211_if_setup(struct ne
+@@ -1053,7 +1053,7 @@ static void ieee80211_if_setup(struct ne
  {
        ether_setup(dev);
        dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -232,7 +232,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        dev->destructor = free_netdev;
  }
  
-@@ -1171,7 +1171,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1216,7 +1216,7 @@ static void ieee80211_setup_sdata(struct
  
        /* only monitor/p2p-device differ */
        if (sdata->dev) {
@@ -241,7 +241,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
                sdata->dev->type = ARPHRD_ETHER;
        }
  
-@@ -1206,7 +1206,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1251,7 +1251,7 @@ static void ieee80211_setup_sdata(struct
                break;
        case NL80211_IFTYPE_MONITOR:
                sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;

diff --git a/patches/collateral-evolutions/network/0002-net-misc.patch b/patches/collateral-evolutions/network/0002-net-misc.patch
index b103c01f6b6519766cc329a8f250b1a68622e020..8f868c05de3ec960b6bdb02f07214146cd24f40b 100644 (file)
--- a/patches/collateral-evolutions/network/0002-net-misc.patch
+++ b/patches/collateral-evolutions/network/0002-net-misc.patch
@@ -22,7 +22,7 @@ compile tested against older kernels.
         * For RX we handle drivers that zero-pad to end-of-packet.
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1009,6 +1009,11 @@ static void ieee80211_if_setup(struct ne
+@@ -1054,6 +1054,11 @@ static void ieee80211_if_setup(struct ne
        ether_setup(dev);
        dev->priv_flags &= ~IFF_TX_SKB_SHARING;
        netdev_attach_ops(dev, &ieee80211_dataif_ops);

diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch
index be60b198f50066e1d096900c82d1e18fbf341817..2fd5422b9978a1538bbe22190ae5df5e7481e5d7 100644 (file)
--- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch
+++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch
@@ -4,7 +4,7 @@ could be used.
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1493,6 +1493,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1538,6 +1538,7 @@ int ieee80211_if_add(struct ieee80211_lo
                        return -ENOMEM;
                dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -12,7 +12,7 @@ could be used.
                ndev->needed_headroom = local->tx_headroom +
                                        4*6 /* four MAC addresses */
                                        + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1501,6 +1502,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1546,6 +1547,7 @@ int ieee80211_if_add(struct ieee80211_lo
                                        - ETH_HLEN /* ethernet hard_header_len */
                                        + IEEE80211_ENCRYPT_HEADROOM;
                ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;

diff --git a/patches/collateral-evolutions/network/0005-netlink-portid.patch b/patches/collateral-evolutions/network/0005-netlink-portid.patch
index b7df3f1129790b241dd7522eb065d0e7e861cdfc..0ad163d056745c26fe8c10b616a5641f51a129fb 100644 (file)
--- a/patches/collateral-evolutions/network/0005-netlink-portid.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid.patch
@@ -42,7 +42,7 @@ this one should other drivers / subsystem need this change.
 
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1925,10 +1925,10 @@ static int hwsim_register_received_nl(st
+@@ -1930,10 +1930,10 @@ static int hwsim_register_received_nl(st
        if (info == NULL)
                goto out;
  
@@ -55,7 +55,7 @@ this one should other drivers / subsystem need this change.
  
        return 0;
  out:
-@@ -1965,7 +1965,7 @@ static int mac80211_hwsim_netlink_notify
+@@ -1970,7 +1970,7 @@ static int mac80211_hwsim_netlink_notify
        if (state != NETLINK_URELEASE)
                return NOTIFY_DONE;
  
@@ -66,7 +66,7 @@ this one should other drivers / subsystem need this change.
                wmediumd_portid = 0;
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1282,7 +1282,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1284,7 +1284,7 @@ static int nl80211_dump_wiphy(struct sk_
                        continue;
                if (++idx <= start)
                        continue;
@@ -75,7 +75,7 @@ this one should other drivers / subsystem need this change.
                                       cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                       dev) < 0) {
                        idx--;
-@@ -1305,7 +1305,7 @@ static int nl80211_get_wiphy(struct sk_b
+@@ -1307,7 +1307,7 @@ static int nl80211_get_wiphy(struct sk_b
        if (!msg)
                return -ENOMEM;
  
@@ -84,7 +84,7 @@ this one should other drivers / subsystem need this change.
                nlmsg_free(msg);
                return -ENOBUFS;
        }
-@@ -1940,7 +1940,7 @@ static int nl80211_dump_interface(struct
+@@ -1886,7 +1886,7 @@ static int nl80211_dump_interface(struct
                                if_idx++;
                                continue;
                        }
@@ -93,7 +93,7 @@ this one should other drivers / subsystem need this change.
                                               cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                               rdev, wdev) < 0) {
                                mutex_unlock(&rdev->devlist_mtx);
-@@ -1971,7 +1971,7 @@ static int nl80211_get_interface(struct
+@@ -1917,7 +1917,7 @@ static int nl80211_get_interface(struct
        if (!msg)
                return -ENOMEM;
  
@@ -102,7 +102,7 @@ this one should other drivers / subsystem need this change.
                               dev, wdev) < 0) {
                nlmsg_free(msg);
                return -ENOBUFS;
-@@ -2189,7 +2189,7 @@ static int nl80211_new_interface(struct
+@@ -2135,7 +2135,7 @@ static int nl80211_new_interface(struct
                break;
        }
  
@@ -111,7 +111,7 @@ this one should other drivers / subsystem need this change.
                               rdev, wdev) < 0) {
                nlmsg_free(msg);
                return -ENOBUFS;
-@@ -2324,7 +2324,7 @@ static int nl80211_get_key(struct sk_buf
+@@ -2270,7 +2270,7 @@ static int nl80211_get_key(struct sk_buf
        if (!msg)
                return -ENOMEM;
  
@@ -120,7 +120,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_NEW_KEY);
        if (IS_ERR(hdr))
                return PTR_ERR(hdr);
-@@ -3100,7 +3100,7 @@ static int nl80211_dump_station(struct s
+@@ -3072,7 +3072,7 @@ static int nl80211_dump_station(struct s
                        goto out_err;
  
                if (nl80211_send_station(skb,
@@ -129,7 +129,7 @@ this one should other drivers / subsystem need this change.
                                cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                dev, netdev, mac_addr,
                                &sinfo) < 0)
-@@ -3146,7 +3146,7 @@ static int nl80211_get_station(struct sk
+@@ -3118,7 +3118,7 @@ static int nl80211_get_station(struct sk
        if (!msg)
                return -ENOMEM;
  
@@ -138,7 +138,7 @@ this one should other drivers / subsystem need this change.
                                 rdev, dev, mac_addr, &sinfo) < 0) {
                nlmsg_free(msg);
                return -ENOBUFS;
-@@ -3562,7 +3562,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -3534,7 +3534,7 @@ static int nl80211_dump_mpath(struct sk_
                if (err)
                        goto out_err;
  
@@ -147,7 +147,7 @@ this one should other drivers / subsystem need this change.
                                       cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                       netdev, dst, next_hop,
                                       &pinfo) < 0)
-@@ -3611,7 +3611,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -3583,7 +3583,7 @@ static int nl80211_get_mpath(struct sk_b
        if (!msg)
                return -ENOMEM;
  
@@ -174,7 +174,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_GET_REG);
        if (!hdr)
                goto put_failure;
-@@ -4813,7 +4813,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -4814,7 +4814,7 @@ static int nl80211_send_bss(struct sk_bu
  
        ASSERT_WDEV_LOCK(wdev);
  
@@ -183,7 +183,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_NEW_SCAN_RESULTS);
        if (!hdr)
                return -1;
-@@ -5032,7 +5032,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5041,7 +5041,7 @@ static int nl80211_dump_survey(struct sk
                }
  
                if (nl80211_send_survey(skb,
@@ -192,7 +192,7 @@ this one should other drivers / subsystem need this change.
                                cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                netdev,
                                &survey) < 0)
-@@ -5677,7 +5677,7 @@ static int nl80211_testmode_dump(struct
+@@ -5687,7 +5687,7 @@ static int nl80211_testmode_dump(struct
        }
  
        while (1) {
@@ -201,7 +201,7 @@ this one should other drivers / subsystem need this change.
                                           cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                           NL80211_CMD_TESTMODE);
                struct nlattr *tmdata;
-@@ -5756,7 +5756,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -5766,7 +5766,7 @@ struct sk_buff *cfg80211_testmode_alloc_
                return NULL;
  
        return __cfg80211_testmode_alloc_skb(rdev, approxlen,
@@ -210,7 +210,7 @@ this one should other drivers / subsystem need this change.
                                rdev->testmode_info->snd_seq,
                                GFP_KERNEL);
  }
-@@ -6089,7 +6089,7 @@ static int nl80211_remain_on_channel(str
+@@ -6099,7 +6099,7 @@ static int nl80211_remain_on_channel(str
        if (!msg)
                return -ENOMEM;
  
@@ -219,7 +219,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_REMAIN_ON_CHANNEL);
  
        if (IS_ERR(hdr)) {
-@@ -6308,7 +6308,7 @@ static int nl80211_register_mgmt(struct
+@@ -6318,7 +6318,7 @@ static int nl80211_register_mgmt(struct
        if (!rdev->ops->mgmt_tx)
                return -EOPNOTSUPP;
  
@@ -228,7 +228,7 @@ this one should other drivers / subsystem need this change.
                        nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
                        nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
  }
-@@ -6378,7 +6378,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -6388,7 +6388,7 @@ static int nl80211_tx_mgmt(struct sk_buf
                if (!msg)
                        return -ENOMEM;
  
@@ -237,7 +237,7 @@ this one should other drivers / subsystem need this change.
                                     NL80211_CMD_FRAME);
  
                if (IS_ERR(hdr)) {
-@@ -6493,7 +6493,7 @@ static int nl80211_get_power_save(struct
+@@ -6503,7 +6503,7 @@ static int nl80211_get_power_save(struct
        if (!msg)
                return -ENOMEM;
  
@@ -246,7 +246,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_GET_POWER_SAVE);
        if (!hdr) {
                err = -ENOBUFS;
-@@ -6684,7 +6684,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -6693,7 +6693,7 @@ static int nl80211_get_wowlan(struct sk_
        if (!msg)
                return -ENOMEM;
  
@@ -255,7 +255,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_GET_WOWLAN);
        if (!hdr)
                goto nla_put_failure;
-@@ -6961,7 +6961,7 @@ static int nl80211_register_unexpected_f
+@@ -6970,7 +6970,7 @@ static int nl80211_register_unexpected_f
        if (wdev->ap_unexpected_nlportid)
                return -EBUSY;
  
@@ -264,7 +264,7 @@ this one should other drivers / subsystem need this change.
        return 0;
  }
  
-@@ -6991,7 +6991,7 @@ static int nl80211_probe_client(struct s
+@@ -7000,7 +7000,7 @@ static int nl80211_probe_client(struct s
        if (!msg)
                return -ENOMEM;
  
@@ -273,7 +273,7 @@ this one should other drivers / subsystem need this change.
                             NL80211_CMD_PROBE_CLIENT);
  
        if (IS_ERR(hdr)) {
-@@ -7035,13 +7035,13 @@ static int nl80211_register_beacons(stru
+@@ -7044,13 +7044,13 @@ static int nl80211_register_beacons(stru
        /* First, check if already registered. */
        spin_lock_bh(&rdev->beacon_registrations_lock);
        list_for_each_entry(reg, &rdev->beacon_registrations, list) {
@@ -289,7 +289,7 @@ this one should other drivers / subsystem need this change.
        list_add(&nreg->list, &rdev->beacon_registrations);
  
        spin_unlock_bh(&rdev->beacon_registrations_lock);
-@@ -9169,12 +9169,12 @@ static int nl80211_netlink_notify(struct
+@@ -9178,12 +9178,12 @@ static int nl80211_netlink_notify(struct
  
        list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
                list_for_each_entry_rcu(wdev, &rdev->wdev_list, list)

diff --git a/patches/collateral-evolutions/network/04-netns.patch b/patches/collateral-evolutions/network/04-netns.patch
index 1365b45f90cb1efce7d658441612abf1a003dbb5..14ba489f10198b1e1868f37188eb6b23d41243bc 100644 (file)
--- a/patches/collateral-evolutions/network/04-netns.patch
+++ b/patches/collateral-evolutions/network/04-netns.patch
@@ -6,7 +6,7 @@ files...
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5940,7 +5940,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5950,7 +5950,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/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch
index 518d2338e8b8ec3b04770780f601c3c6aeddf3af..3dc009421c1e9649b82ee1166a6692bc40ac59f8 100644 (file)
--- a/patches/collateral-evolutions/network/08-rename-config-options.patch
+++ b/patches/collateral-evolutions/network/08-rename-config-options.patch
@@ -124,7 +124,7 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -760,7 +760,7 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -817,7 +817,7 @@ void ath9k_set_hw_capab(struct ath_softc
        sc->ant_rx = hw->wiphy->available_antennas_rx;
        sc->ant_tx = hw->wiphy->available_antennas_tx;
  

diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch
index 5942caed53b266d5d9cd50607e1c76e2ef6b667d..75a2bfed9b20b6eb441747cd349d639ca0dcde82 100644 (file)
--- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch
+++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch
@@ -30,7 +30,7 @@ moved due to struct enlargements.
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -2259,6 +2259,9 @@ struct wiphy_wowlan_support {
+@@ -2294,6 +2294,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
        /* assign these fields before you register the wiphy */
  

diff --git a/patches/collateral-evolutions/network/09-threaded-irq.patch b/patches/collateral-evolutions/network/09-threaded-irq.patch
index a7d2fe616a6bc87c2374f73e9e2eca6ff8d15dc3..196e14fbfd833107a4f9241a43490b362aa42cd7 100644 (file)
--- a/patches/collateral-evolutions/network/09-threaded-irq.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq.patch
@@ -20,7 +20,7 @@ thread in process context as well.
        }
        mutex_lock(&wl->mutex);
        dev = wl->current_dev;
-@@ -4255,9 +4260,17 @@ static int b43_wireless_core_start(struc
+@@ -4259,9 +4264,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);
-@@ -5080,6 +5093,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5084,6 +5097,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {
@@ -101,7 +101,7 @@ thread in process context as well.
  
  out_free_nvs:
        kfree(wl->nvs);
-@@ -5696,7 +5711,12 @@ int __devexit wlcore_remove(struct platf
+@@ -5696,7 +5711,12 @@ int wlcore_remove(struct platform_device
                disable_irq_wake(wl->irq);
        }
        wl1271_unregister_hw(wl);

diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
index 35ef6953fbec3a49a0fd31d682f3d3173ffde3c1..42b74e3c1ef8dc95b9278021305e48ea02d59b66 100644 (file)
--- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
@@ -34,7 +34,7 @@ calls on compat code with only slight modifications.
  int __init bcma_host_pci_init(void)
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2691,6 +2691,9 @@ static const struct pci_error_handlers a
+@@ -2690,6 +2690,9 @@ static const struct pci_error_handlers a
        .resume = atl1c_io_resume,
  };
  
@@ -44,8 +44,8 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
  
  static struct pci_driver atl1c_driver = {
-@@ -2700,7 +2703,12 @@ static struct pci_driver atl1c_driver =
-       .remove   = __devexit_p(atl1c_remove),
+@@ -2699,7 +2702,12 @@ static struct pci_driver atl1c_driver =
+       .remove   = atl1c_remove,
        .shutdown = atl1c_shutdown,
        .err_handler = &atl1c_err_handler,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
@@ -69,9 +69,9 @@ 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)
  
-@@ -3148,7 +3151,12 @@ static struct pci_driver atl1_driver = {
+@@ -3147,7 +3150,12 @@ static struct pci_driver atl1_driver = {
        .probe = atl1_probe,
-       .remove = __devexit_p(atl1_remove),
+       .remove = atl1_remove,
        .shutdown = atl1_shutdown,
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
        .driver.pm = ATL1_PM_OPS,
@@ -184,7 +184,7 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1843,7 +1843,14 @@ __le32 il_add_beacon_time(struct il_priv
+@@ -1835,7 +1835,14 @@ __le32 il_add_beacon_time(struct il_priv
                          u32 beacon_interval);
  
  #ifdef CONFIG_PM
@@ -226,7 +226,7 @@ calls on compat code with only slight modifications.
  int __must_check iwl_pci_register_driver(void)
 --- a/drivers/net/wireless/libertas/if_spi.c
 +++ b/drivers/net/wireless/libertas/if_spi.c
-@@ -1249,6 +1249,7 @@ static int __devexit libertas_spi_remove
+@@ -1249,6 +1249,7 @@ static int libertas_spi_remove(struct sp
        return 0;
  }
  

diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
index a836b9457125c19d6c5b91afaae3d1475af33366..9b6d36eb333e2644b4ca5f6c5b1bf9c5bec01377 100644 (file)
--- a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
+++ b/patches/collateral-evolutions/network/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
-@@ -3203,7 +3203,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3243,7 +3243,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
        kfree_skb(skb);
  }

diff --git a/patches/collateral-evolutions/network/16-bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth.patch
index 8c690ae76a71c9f547d260f792ae4c4668e73426..f2ac4a20e0128bcd836d553597c29e1ac5e9e97e 100644 (file)
--- a/patches/collateral-evolutions/network/16-bluetooth.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth.patch
@@ -271,8 +271,8 @@ here still, but for now we keep this here.
 +#endif
        hid->hid_output_raw_report = hidp_output_raw_report;
  
-       return 0;
-@@ -953,6 +1036,7 @@ fault:
+       /* True if device is blacklisted in drivers/hid/hid-core.c */
+@@ -960,6 +1043,7 @@ fault:
  
        return err;
  }
@@ -280,7 +280,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)
  {
-@@ -968,6 +1052,39 @@ int hidp_add_connection(struct hidp_conn
+@@ -975,6 +1059,39 @@ int hidp_add_connection(struct hidp_conn
  
        BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size);
  
@@ -320,15 +320,15 @@ here still, but for now we keep this here.
        down_write(&hidp_session_sem);
  
        s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-@@ -1015,6 +1132,7 @@ int hidp_add_connection(struct hidp_conn
+@@ -1022,6 +1139,7 @@ int hidp_add_connection(struct hidp_conn
  
        __hidp_link_session(session);
  
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
        if (req->rd_size > 0) {
                err = hidp_setup_hid(session, req);
-               if (err)
-@@ -1026,6 +1144,16 @@ int hidp_add_connection(struct hidp_conn
+               if (err && err != -ENODEV)
+@@ -1033,6 +1151,16 @@ int hidp_add_connection(struct hidp_conn
                if (err < 0)
                        goto purge;
        }
@@ -345,7 +345,7 @@ here still, but for now we keep this here.
  
        hidp_set_timer(session);
  
-@@ -1084,6 +1212,7 @@ unlink:
+@@ -1091,6 +1219,7 @@ unlink:
                session->input = NULL;
        }
  
@@ -353,7 +353,7 @@ here still, but for now we keep this here.
        if (session->hid) {
                hid_destroy_device(session->hid);
                session->hid = NULL;
-@@ -1097,10 +1226,15 @@ purge:
+@@ -1104,10 +1233,15 @@ purge:
  
        skb_queue_purge(&session->ctrl_transmit);
        skb_queue_purge(&session->intr_transmit);
@@ -462,7 +462,7 @@ here still, but for now we keep this here.
        struct rfcomm_dlc *dlc = dev->dlc;
 --- a/net/bluetooth/sco.c
 +++ b/net/bluetooth/sco.c
-@@ -433,8 +433,12 @@ static struct sock *sco_sock_alloc(struc
+@@ -424,8 +424,12 @@ static struct sock *sco_sock_alloc(struc
        return sk;
  }
  
@@ -475,7 +475,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -685,7 +689,11 @@ static int sco_sock_recvmsg(struct kiocb
+@@ -676,7 +680,11 @@ static int sco_sock_recvmsg(struct kiocb
        return bt_sock_recvmsg(iocb, sock, msg, len, flags);
  }
  

diff --git a/patches/collateral-evolutions/network/17-netdev-queue.patch b/patches/collateral-evolutions/network/17-netdev-queue.patch
index af10e5a739bd4300fd1c20b84455875c1390a442..a3ac4f760b4cbf2eec5ce4983c90d93de4b94240 100644 (file)
--- a/patches/collateral-evolutions/network/17-netdev-queue.patch
+++ b/patches/collateral-evolutions/network/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
-@@ -1613,6 +1613,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1658,6 +1658,7 @@ void ieee80211_sdata_stop(struct ieee802
   * 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;
-@@ -1640,6 +1641,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1685,6 +1686,22 @@ void ieee80211_remove_interfaces(struct
                kfree(sdata);
        }
  }

diff --git a/patches/collateral-evolutions/network/24-pcmcia.patch b/patches/collateral-evolutions/network/24-pcmcia.patch
index 634c44764d225e69f956c799aa98e3d0d6daf4d2..56c0dfe474f7193e9a872add3f4679bce81e3f80 100644 (file)
--- a/patches/collateral-evolutions/network/24-pcmcia.patch
+++ b/patches/collateral-evolutions/network/24-pcmcia.patch
@@ -754,7 +754,7 @@
 --- a/drivers/net/wireless/b43/pcmcia.c
 +++ b/drivers/net/wireless/b43/pcmcia.c
 @@ -63,6 +63,9 @@ static int b43_pcmcia_resume(struct pcmc
- static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
+ static int b43_pcmcia_probe(struct pcmcia_device *dev)
  {
        struct ssb_bus *ssb;
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
@@ -763,7 +763,7 @@
        int err = -ENOMEM;
        int res = 0;
  
-@@ -72,6 +75,7 @@ static int __devinit b43_pcmcia_probe(st
+@@ -72,6 +75,7 @@ static int b43_pcmcia_probe(struct pcmci
  
        err = -ENODEV;
  
@@ -771,7 +771,7 @@
        dev->config_flags |= CONF_ENABLE_IRQ;
  
        dev->resource[2]->flags |=  WIN_ENABLE | WIN_DATA_WIDTH_16 |
-@@ -79,21 +83,46 @@ static int __devinit b43_pcmcia_probe(st
+@@ -79,21 +83,46 @@ static int b43_pcmcia_probe(struct pcmci
        dev->resource[2]->start = 0;
        dev->resource[2]->end = SSB_CORE_SIZE;
        res = pcmcia_request_window(dev, dev->resource[2], 250);
@@ -819,7 +819,7 @@
        if (err)
                goto err_disable;
        dev->priv = ssb;
-@@ -122,7 +151,13 @@ static void __devexit b43_pcmcia_remove(
+@@ -122,7 +151,13 @@ static void b43_pcmcia_remove(struct pcm
  
  static struct pcmcia_driver b43_pcmcia_driver = {
        .owner          = THIS_MODULE,
@@ -832,7 +832,7 @@
 +#endif
        .id_table       = b43_pcmcia_tbl,
        .probe          = b43_pcmcia_probe,
-       .remove         = __devexit_p(b43_pcmcia_remove),
+       .remove         = b43_pcmcia_remove,
 --- a/drivers/net/wireless/libertas/if_cs.c
 +++ b/drivers/net/wireless/libertas/if_cs.c
 @@ -757,7 +757,11 @@ static void if_cs_prog_firmware(struct l
@@ -1400,7 +1400,7 @@
        .suspend        = spectrum_cs_suspend,
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -504,7 +504,11 @@ static int ssb_devices_register(struct s
+@@ -510,7 +510,11 @@ static int ssb_devices_register(struct s
                        break;
                case SSB_BUSTYPE_PCMCIA:
  #ifdef CONFIG_SSB_PCMCIAHOST

diff --git a/patches/collateral-evolutions/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch
index 3efa9e2c15257d04616a99f59189064faf81745b..dd1f4f6154632ee116bfe8939a34b68fa8b65958 100644 (file)
--- a/patches/collateral-evolutions/network/25-multicast-list_head.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head.patch
@@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        }
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2494,7 +2494,11 @@ struct ieee80211_ops {
+@@ -2499,7 +2499,11 @@ struct ieee80211_ops {
        void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
  
        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
-@@ -925,7 +925,12 @@ struct ieee80211_local {
+@@ -927,7 +927,12 @@ struct ieee80211_local {
        struct work_struct reconfig_filter;
  
        /* aggregated multicast list */
@@ -727,7 +727,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -762,8 +762,13 @@ static void ieee80211_do_stop(struct iee
+@@ -807,8 +807,13 @@ static void ieee80211_do_stop(struct iee
        if (sdata->dev) {
                netif_addr_lock_bh(sdata->dev);
                spin_lock_bh(&local->filter_lock);
@@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                spin_unlock_bh(&local->filter_lock);
                netif_addr_unlock_bh(sdata->dev);
  
-@@ -920,7 +925,12 @@ static void ieee80211_set_multicast_list
+@@ -965,7 +970,12 @@ static void ieee80211_set_multicast_list
                sdata->flags ^= IEEE80211_SDATA_PROMISC;
        }
        spin_lock_bh(&local->filter_lock);
@@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
        spin_unlock_bh(&local->filter_lock);
  
        /* be a bit nasty */
-@@ -642,9 +646,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -645,9 +649,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
        wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
  
        INIT_LIST_HEAD(&local->interfaces);

diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch
index b3654a2143dd02937d81574ebb2a710a3c0e89e3..1bc4cd9b547bcefe9787cd84e28c25a5b55c06d9 100644 (file)
--- a/patches/collateral-evolutions/network/29-sdio_no_suspend.patch
+++ b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch
@@ -151,7 +151,7 @@ suspend and resume that are not backported.
        int retry = 0;
        while (atomic_read(&sdiodev->suspend) && retry++ != 30)
                wait_event_timeout(*wq, false, HZ/100);
-@@ -550,7 +550,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -548,7 +548,7 @@ static void brcmf_ops_sdio_remove(struct
        brcmf_dbg(TRACE, "Exit\n");
  }
  
@@ -160,7 +160,7 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev)
  {
        mmc_pm_flag_t sdio_flags;
-@@ -600,7 +600,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -598,7 +598,7 @@ static struct sdio_driver brcmf_sdmmc_dr
        .remove = brcmf_ops_sdio_remove,
        .name = "brcmfmac",
        .id_table = brcmf_sdmmc_ids,

diff --git a/patches/collateral-evolutions/network/30-bridge-port.patch b/patches/collateral-evolutions/network/30-bridge-port.patch
index a426274e6c84b63d4ff9ddb8b3ef1fd2a7e5ab91..6b9aaa18d1bca42f912b65500a905fbc49dee21b 100644 (file)
--- a/patches/collateral-evolutions/network/30-bridge-port.patch
+++ b/patches/collateral-evolutions/network/30-bridge-port.patch
@@ -23,7 +23,7 @@ compat-drivers.
 
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -816,7 +816,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-drivers.
             ntype == NL80211_IFTYPE_P2P_CLIENT))
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2014,7 +2014,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -1960,7 +1960,7 @@ static int nl80211_valid_4addr(struct cf
                               enum nl80211_iftype iftype)
  {
        if (!use_4addr) {

diff --git a/patches/collateral-evolutions/network/36-workqueue.patch b/patches/collateral-evolutions/network/36-workqueue.patch
index f7a2b1a701f079603a0b06c88271467b00e2e3fb..3348d277f937241a5d42666100508d2c6cf9e8b7 100644 (file)
--- a/patches/collateral-evolutions/network/36-workqueue.patch
+++ b/patches/collateral-evolutions/network/36-workqueue.patch
@@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h
 
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -1194,6 +1194,10 @@ static void __exit ieee80211_exit(void)
+@@ -1197,6 +1197,10 @@ static void __exit ieee80211_exit(void)
        rc80211_minstrel_ht_exit();
        rc80211_minstrel_exit();
  

diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features.patch b/patches/collateral-evolutions/network/40-netdev-hw-features.patch
index 605e97f1d2819cbc2cfc7649760acf369a55dd64..59f2667f2155c0cee99b32f42e90e56cc39cee40 100644 (file)
--- a/patches/collateral-evolutions/network/40-netdev-hw-features.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features.patch
@@ -202,7 +202,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
-@@ -3029,11 +3031,13 @@ static int __devinit atl1_probe(struct p
+@@ -3028,11 +3030,13 @@ static int atl1_probe(struct pci_dev *pd
        netdev->features |= NETIF_F_SG;
        netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
  
@@ -216,7 +216,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
        /*
         * patch for some L1 of old version,
-@@ -3646,6 +3650,14 @@ static int atl1_set_pauseparam(struct ne
+@@ -3645,6 +3649,14 @@ static int atl1_set_pauseparam(struct ne
        return 0;
  }
  
@@ -231,7 +231,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static void atl1_get_strings(struct net_device *netdev, u32 stringset,
        u8 *data)
  {
-@@ -3718,4 +3730,10 @@ static const struct ethtool_ops atl1_eth
+@@ -3717,4 +3729,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,
@@ -271,7 +271,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
        .ndo_do_ioctl           = atl2_ioctl,
        .ndo_tx_timeout         = atl2_tx_timeout,
  #ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -1421,8 +1425,12 @@ static int __devinit atl2_probe(struct p
+@@ -1420,8 +1424,12 @@ static int atl2_probe(struct pci_dev *pd
  
        err = -EIO;
  
@@ -284,7 +284,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
        /* Init PHY as early as possible due to power saving issue  */
        atl2_phy_init(&adapter->hw);
-@@ -1849,6 +1857,13 @@ static int atl2_set_settings(struct net_
+@@ -1848,6 +1856,13 @@ static int atl2_set_settings(struct net_
        return 0;
  }
  
@@ -298,7 +298,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static u32 atl2_get_msglevel(struct net_device *netdev)
  {
        return 0;
-@@ -2118,6 +2133,14 @@ static const struct ethtool_ops atl2_eth
+@@ -2117,6 +2132,14 @@ static const struct ethtool_ops atl2_eth
        .get_eeprom_len         = atl2_get_eeprom_len,
        .get_eeprom             = atl2_get_eeprom,
        .set_eeprom             = atl2_set_eeprom,

diff --git a/patches/collateral-evolutions/network/42-netlink_seq.patch b/patches/collateral-evolutions/network/42-netlink_seq.patch
index bb065ab1cbca06e3804032066395314e50e0ed27..93cd139b621d3f25e99d20359c8e91b7456519b4 100644 (file)
--- a/patches/collateral-evolutions/network/42-netlink_seq.patch
+++ b/patches/collateral-evolutions/network/42-netlink_seq.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -4910,7 +4910,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4919,7 +4919,9 @@ static int nl80211_dump_scan(struct sk_b
        spin_lock_bh(&rdev->bss_lock);
        cfg80211_bss_expire(rdev);
  

diff --git a/patches/collateral-evolutions/network/46-use_other_workqueue.patch b/patches/collateral-evolutions/network/46-use_other_workqueue.patch
index 16fa39b56b0ed41d215c58c13f077ef2d6df3c29..9ee028b6ecbd00092b1ec9a9b6d54e1f75df801e 100644 (file)
--- a/patches/collateral-evolutions/network/46-use_other_workqueue.patch
+++ b/patches/collateral-evolutions/network/46-use_other_workqueue.patch
@@ -4,7 +4,7 @@ position before.
 
 --- a/net/bluetooth/hci_core.c
 +++ b/net/bluetooth/hci_core.c
-@@ -1789,8 +1789,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1792,8 +1792,12 @@ int hci_register_dev(struct hci_dev *hde
        list_add(&hdev->list, &hci_dev_list);
        write_unlock(&hci_dev_list_lock);
  

diff --git a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch
index f27801d73c9240cd9a51224e869b62a471170ef3..3c82cb948f38e3aa9c54260670887ed32f3a0083 100644 (file)
--- a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch
+++ b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch
@@ -21,7 +21,7 @@ function always returns something.
  
 --- a/drivers/net/wireless/b43legacy/main.c
 +++ b/drivers/net/wireless/b43legacy/main.c
-@@ -2504,11 +2504,11 @@ static void b43legacy_op_tx(struct ieee8
+@@ -2529,11 +2529,11 @@ static void b43legacy_op_tx(struct ieee8
        }
        B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags);
  

diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
index 8f8754e47a124aa7d92074a963f22d0191bfed20..b4766170a83216fff1273a9df29fa2252d8d495b 100644 (file)
--- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
@@ -17,7 +17,7 @@ v2.6.36-rc1~571^2~104
  
        atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.mac_addr);
  
-@@ -2569,7 +2571,9 @@ static int __devinit atl1c_probe(struct
+@@ -2568,7 +2570,9 @@ static int atl1c_probe(struct pci_dev *p
        }
        if (atl1c_read_mac_addr(&adapter->hw)) {
                /* got a random MAC address, set NET_ADDR_RANDOM to netdev */
@@ -41,7 +41,7 @@ v2.6.36-rc1~571^2~104
        return 0;
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -3061,7 +3061,9 @@ static int __devinit atl1_probe(struct p
+@@ -3060,7 +3060,9 @@ static int atl1_probe(struct pci_dev *pd
        /* copy the MAC address out of the EEPROM */
        if (atl1_read_mac_addr(&adapter->hw)) {
                /* mark random mac */

diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
index 7b2acdf121b073c95def3cb9edfdde3d0b5d7f21..b90ff03acbac9da13b03f9067bf24226df312c6d 100644 (file)
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
@@ -132,7 +132,7 @@
  module_usb_driver(carl9170_driver);
 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
-@@ -1502,7 +1502,9 @@ static struct usb_driver brcmf_usbdrvr =
+@@ -1507,7 +1507,9 @@ static struct usb_driver brcmf_usbdrvr =
        .resume = brcmf_usb_resume,
        .reset_resume = brcmf_usb_reset_resume,
        .supports_autosuspend = 1,
@@ -216,7 +216,7 @@
  module_usb_driver(rt2500usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1284,7 +1284,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1285,7 +1285,9 @@ static struct usb_driver rt2800usb_drive
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,
        .reset_resume   = rt2x00usb_resume,