summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/30-bridge-port
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-05-31 21:15:24 +0200
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-06-05 20:41:38 -0700
commitb13970c3395d5fca038a7227a633e52c192883da (patch)
tree57b6b3edb429b51508a01b419a71c3c9550e2a4d /patches/collateral-evolutions/network/30-bridge-port
parent0f0c6cf97b8881222966878a88d2d2e4e4587527 (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/30-bridge-port')
-rw-r--r--patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch2
-rw-r--r--patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
index 434b59c0..8f66c74b 100644
--- a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -2309,7 +2309,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -2257,7 +2257,7 @@ static int nl80211_valid_4addr(struct cf
enum nl80211_iftype iftype)
{
if (!use_4addr) {
diff --git a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch
index 1b69dd11..7edc7740 100644
--- a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch
+++ b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
-@@ -815,7 +815,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -834,7 +834,7 @@ int cfg80211_change_iface(struct cfg8021
return -EOPNOTSUPP;
/* if it's part of a bridge, reject changing type to station/ibss */