diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-05-31 21:15:24 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-06-05 20:41:38 -0700 |
| commit | b13970c3395d5fca038a7227a633e52c192883da (patch) | |
| tree | 57b6b3edb429b51508a01b419a71c3c9550e2a4d /patches/collateral-evolutions/network/32-remove-ns-type | |
| parent | 0f0c6cf97b8881222966878a88d2d2e4e4587527 (diff) | |
backports: refresh patches for next-20130531backports-20130531
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.79 [ OK ]
18 3.1.10 [ OK ]
19 3.10-rc1 [ OK ]
20 3.2.45 [ OK ]
21 3.3.8 [ OK ]
22 3.4.46 [ OK ]
23 3.5.7 [ OK ]
24 3.6.11 [ OK ]
25 3.7.10 [ OK ]
26 3.8.13 [ OK ]
27 3.9.3 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/32-remove-ns-type')
| -rw-r--r-- | patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch b/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch index 9f25775b..e68fab05 100644 --- a/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch +++ b/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch @@ -1,8 +1,8 @@ --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c -@@ -133,12 +133,14 @@ static int wiphy_resume(struct device *d - return ret; +@@ -135,12 +135,14 @@ static int wiphy_resume(struct device *d } + #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) static const void *wiphy_namespace(struct device *d) @@ -15,10 +15,10 @@ struct class ieee80211_class = { .name = "ieee80211", -@@ -148,8 +150,10 @@ struct class ieee80211_class = { - .dev_uevent = wiphy_uevent, +@@ -152,8 +154,10 @@ struct class ieee80211_class = { .suspend = wiphy_suspend, .resume = wiphy_resume, + #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) .ns_type = &net_ns_type_operations, .namespace = wiphy_namespace, |