summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/81-genl-const
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-12-06 19:21:50 +0100
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-12-08 15:53:53 +0100
commit71c4128f78bcbcc90de5a9cdc279082fdc17f91e (patch)
tree9e5f3d10be5eb5730b0c7d70b1f8856d3b4b6712 /patches/collateral-evolutions/network/81-genl-const
parent2cc668364aca6d140f37710bd3d2872fda831f96 (diff)
backports: refresh patches for next-20131206
Run time of generation of release: real 5m28.543s user 3m4.536s sys 2m2.940s spatch version 1.0.0-rc17 with Python support and with PCRE support == ckmake-report.log == 1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.101 [ OK ] 17 3.1.10 [ OK ] 18 3.2.52 [ OK ] 19 3.3.8 [ OK ] 20 3.4.70 [ OK ] 21 3.5.7 [ OK ] 22 3.6.11 [ OK ] 23 3.7.10 [ OK ] 24 3.8.13 [ OK ] 25 3.9.11 [ OK ] 26 3.10.20 [ OK ] 27 3.11.9 [ OK ] 28 3.12.1 [ OK ] 29 3.13-rc1 [ OK ] real 37m43.297s user 1030m36.392s sys 138m31.368s Cc: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/81-genl-const')
-rw-r--r--patches/collateral-evolutions/network/81-genl-const/hwsim.patch2
-rw-r--r--patches/collateral-evolutions/network/81-genl-const/nl80211.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/81-genl-const/hwsim.patch b/patches/collateral-evolutions/network/81-genl-const/hwsim.patch
index 60190bf1..4a31f4f1 100644
--- a/patches/collateral-evolutions/network/81-genl-const/hwsim.patch
+++ b/patches/collateral-evolutions/network/81-genl-const/hwsim.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -2105,7 +2105,7 @@ out:
+@@ -2112,7 +2112,7 @@ out:
}
/* Generic Netlink operations array */
diff --git a/patches/collateral-evolutions/network/81-genl-const/nl80211.patch b/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
index 6aa8d19a..6e50898d 100644
--- a/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
+++ b/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
@@ -21,7 +21,7 @@
[NL80211_MCGRP_CONFIG] = { .name = "config", },
[NL80211_MCGRP_SCAN] = { .name = "scan", },
[NL80211_MCGRP_REGULATORY] = { .name = "regulatory", },
-@@ -8874,7 +8874,7 @@ static int nl80211_crit_protocol_stop(st
+@@ -8890,7 +8890,7 @@ static int nl80211_crit_protocol_stop(st
#define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\
NL80211_FLAG_CHECK_NETDEV_UP)
@@ -30,7 +30,7 @@
struct genl_info *info)
{
struct cfg80211_registered_device *rdev;
-@@ -8943,7 +8943,7 @@ static int nl80211_pre_doit(const struct
+@@ -8959,7 +8959,7 @@ static int nl80211_pre_doit(const struct
return 0;
}
@@ -39,7 +39,7 @@
struct genl_info *info)
{
if (info->user_ptr[1]) {
-@@ -8960,7 +8960,7 @@ static void nl80211_post_doit(const stru
+@@ -8976,7 +8976,7 @@ static void nl80211_post_doit(const stru
rtnl_unlock();
}