]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - wilink8-wlan/compat-wireless.git/commitdiff
remove ksize compat for 2.6.28 kernels (irrelevant) ol_R5.00.14 ol_R5.00.15 ol_R5.00.16 ol_R5.00.17 ol_R5.00.18 ol_R5.00.19 ol_R5.00.20 ol_R5.00.21 ol_R5.SP2.03 r5.00.13-build_139 r5.00.13-build_140 r5.00.13-build_141 r5.00.13-build_142 r5.00.13-build_143 r5.00.13-build_144 r5.00.13-build_145 r5.00.13-build_146 r5.00.14-build_147 r5.00.14-build_148 r5.00.14-build_149 r5.00.14-build_150 r5.00.14-build_151 r5.00.14-build_152 r5.00.14-build_153 r5.00.14-build_154 r5.00.14-build_155 r5.00.14-build_156 r5.00.14-build_157 r5.00.14-build_158 r5.00.15-build_160 r5.00.15-build_161 r5.00.15-build_162 r5.00.15-build_163 r5.00.15-build_164 r5.00.15-build_165 r5.00.15-build_166 r5.00.15-build_167 r5.00.15-build_168 r5.00.15-build_170 r5.00.15-build_171 r5.00.15-build_172 r5.00.15-build_173 r5.00.15-build_174 r5.00.15-build_175 r5.00.15-build_176 r5.00.15-build_177 r5.00.15-build_179 r5.00.15-build_180 r5.00.15-build_181 r5.00.15-build_186 r5.00.15-build_187 r5.00.15-build_188 r5.00.15-build_189 r5.00.15-build_190 r5.00.18-build_196 r5.00.18-build_197 r5.00.18-build_199 r5.00.18-build_200 r5.00.18-build_201 r5.00.18-build_202 r5.00.18-build_203 r5.00.18-build_204 r5.00.18-build_205 r5.00.18-build_206 r5.00.18-build_207 r5.00.18-build_208 r5.00.18-build_209 r5.00.18-build_210 r5.00.18-build_211 r5.00.18-build_212 r5.00.18-build_213 r5.00.18-build_214 r5.00.18-build_215 r5.00.18-build_216 r5.00.19-build_216 r5.00.19-build_217 r5.00.19-build_218 r5.00.19-build_219 r5.00.19-build_220 r5.00.19-build_221 r5.00.19-build_222 r5.00.19-build_223 r5.00.19-build_224 r5.00.19-build_225 r5.00.19-build_226 r5.00.19-build_227 r5.00.19-build_228 r5.00.19-build_229 r5.00.19-build_232 r5.00.19-build_233 r5.00.19-build_234 r5.00.19-build_235 r5.00.19-build_236 r5.00.19-build_237 r5.00.19-build_239 r5.00.19-build_240 r5.00.19-build_241
authorIdo Reis <idor@ti.com>
Wed, 28 Mar 2012 13:15:20 +0000 (15:15 +0200)
committerIdo Reis <idor@ti.com>
Wed, 28 Mar 2012 13:15:20 +0000 (15:15 +0200)
patches/02-ksize.patch [deleted file]

diff --git a/patches/02-ksize.patch b/patches/02-ksize.patch
deleted file mode 100644 (file)
index 0c8c89c..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-ksize() was added as of 2.6.29, it gives you the actual
-size of the allocated data. Since we have no support for
-this we simply do not optimize for it and deal with
-large alloocations for the IEs.
-
-We technically could backport this as
-
-define ksize(bleh) SOME_LARGE_NUMBER
-
-but doing it this way emphasis careful review
-of the situation.
-
---- a/drivers/net/wireless/orinoco/wext.c
-+++ b/drivers/net/wireless/orinoco/wext.c
-@@ -30,8 +30,22 @@ static int orinoco_set_key(struct orinoc
-                          enum orinoco_alg alg, const u8 *key, int key_len,
-                          const u8 *seq, int seq_len)
- {
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28)
-+      int len;
-+      if (!unlikely(ZERO_OR_NULL_PTR(priv->keys[index].key))) {
-+              len = priv->keys[index].key_len;
-+              memset(priv->keys[index].key, 0, len);
-+              kfree(priv->keys[index].key);
-+      }
-+      if (!unlikely(ZERO_OR_NULL_PTR(priv->keys[index].seq))) {
-+              len = priv->keys[index].seq_len;
-+              memset(priv->keys[index].seq, 0, len);
-+              kfree(priv->keys[index].seq);
-+      }
-+#else
-       kzfree(priv->keys[index].key);
-       kzfree(priv->keys[index].seq);
-+#endif
-       if (key_len) {
-               priv->keys[index].key = kzalloc(key_len, GFP_ATOMIC);
---- a/net/wireless/scan.c
-+++ b/net/wireless/scan.c
-@@ -633,9 +633,14 @@ cfg80211_bss_update(struct cfg80211_regi
-                       size_t used = dev->wiphy.bss_priv_size + sizeof(*res);
-                       size_t ielen = res->pub.len_proberesp_ies;
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28)
-+                      if (0) {
-+                              used = 0; /* just to shut up the compiler */
-+#else
-                       if (found->pub.proberesp_ies &&
-                           !found->proberesp_ies_allocated &&
-                           ksize(found) >= used + ielen) {
-+#endif
-                               memcpy(found->pub.proberesp_ies,
-                                      res->pub.proberesp_ies, ielen);
-                               found->pub.len_proberesp_ies = ielen;
-@@ -669,9 +674,14 @@ cfg80211_bss_update(struct cfg80211_regi
-                               (found->pub.information_elements ==
-                                found->pub.beacon_ies);
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28)
-+                      if (0) {
-+                              used = 0; /* just to shut up the compiler */
-+#else
-                       if (found->pub.beacon_ies &&
-                           !found->beacon_ies_allocated &&
-                           ksize(found) >= used + ielen) {
-+#endif
-                               memcpy(found->pub.beacon_ies,
-                                      res->pub.beacon_ies, ielen);
-                               found->pub.len_beacon_ies = ielen;