diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
commit | 30498b130cc0476e73f5142dcc63bc271da2d89b (patch) | |
tree | 4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/09-cfg80211-wext-padding | |
parent | a7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (diff) |
refresh patches against next-20130328
The patches were last refreshed against that same tree,
so the only change is that now we have -p in there, which
results in changes like this (only):
-@@ -1593,7 +1593,7 @@
+@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_
This makes the patches more readable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/09-cfg80211-wext-padding')
-rw-r--r-- | patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h | 2 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h index 0661f90d..fa828678 100644 --- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2561,6 +2561,9 @@ +@@ -2561,6 +2561,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch index 064e1571..051401af 100644 --- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -316,6 +316,17 @@ +@@ -316,6 +316,17 @@ struct wiphy *wiphy_new(const struct cfg struct cfg80211_registered_device *rdev; int alloc_size; |