summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-07 21:54:14 -0700
committerJohannes Berg <johannes.berg@intel.com>2013-05-08 09:02:54 +0200
commitfa6c4f66802adbdd3fb159f39664bb9eee6d9871 (patch)
tree2a8ba3733ac6175ddcead7f27a748c1d5deed2ae /patches
parentc9c99175e0d5221108622f2314e45cc62c7b6516 (diff)
backports: refresh patches for next-20130409
== ckmake-report.log == 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ] real 30m38.751s user 810m14.462s sys 126m48.932s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch2
-rw-r--r--patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch6
-rw-r--r--patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch4
-rw-r--r--patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch4
-rw-r--r--patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch4
5 files changed, 10 insertions, 10 deletions
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
index fb2a4245..722f39f8 100644
--- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
+++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
@@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3993,9 +3993,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -4011,9 +4011,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/network/0001-netdev_ops/mac80211.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch
index bb7023dc..6b67fb76 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1017,7 +1017,7 @@ static void ieee80211_if_setup(struct ne
+@@ -1028,7 +1028,7 @@ static void ieee80211_if_setup(struct ne
{
ether_setup(dev);
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -9,7 +9,7 @@
dev->destructor = free_netdev;
}
-@@ -1180,7 +1180,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1191,7 +1191,7 @@ static void ieee80211_setup_sdata(struct
/* only monitor/p2p-device differ */
if (sdata->dev) {
@@ -18,7 +18,7 @@
sdata->dev->type = ARPHRD_ETHER;
}
-@@ -1218,7 +1218,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1229,7 +1229,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/0003-netdev-needed_headroom_tailroom/mac80211.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
index e5972740..6099f45e 100644
--- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
+++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1513,6 +1513,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1524,6 +1524,7 @@ int ieee80211_if_add(struct ieee80211_lo
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
@@ -8,7 +8,7 @@
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1521,6 +1522,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1532,6 +1533,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/17-netdev-queue/net_mac80211_iface.patch b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
index 87adf23b..afe9ec4d 100644
--- a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1638,6 +1638,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1649,6 +1649,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.
*/
@@ -8,7 +8,7 @@
void ieee80211_remove_interfaces(struct ieee80211_local *local)
{
struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1665,6 +1666,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1676,6 +1677,22 @@ void ieee80211_remove_interfaces(struct
kfree(sdata);
}
}
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
index 5e0bf214..7f5e679a 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -743,8 +743,13 @@ static void ieee80211_do_stop(struct iee
+@@ -754,8 +754,13 @@ static void ieee80211_do_stop(struct iee
if (sdata->dev) {
netif_addr_lock_bh(sdata->dev);
spin_lock_bh(&local->filter_lock);
@@ -14,7 +14,7 @@
spin_unlock_bh(&local->filter_lock);
netif_addr_unlock_bh(sdata->dev);
-@@ -927,10 +932,20 @@ static void ieee80211_set_multicast_list
+@@ -938,10 +943,20 @@ static void ieee80211_set_multicast_list
if (sdata->vif.type != NL80211_IFTYPE_MONITOR &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
sdata->vif.type != NL80211_IFTYPE_AP)