Ticket #378: rtl8187_2.6.22_to_2.6.24.patch

rtl8187_linux_26.1010.0622.

@@ -431 +431 @@
 void rtl8180_proc_module_init(void)
 {
         DMESG("Initializing proc filesystem");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
         rtl8180_proc=create_proc_entry(RTL8187_MODULE_NAME, S_IFDIR, proc_net);
+#else
+        rtl8180_proc=create_proc_entry(RTL8187_MODULE_NAME, S_IFDIR, init_net.proc_net);
+#endif
 }
 
 
 void rtl8180_proc_module_remove(void)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
         remove_proc_entry(RTL8187_MODULE_NAME, proc_net);
+#else
+        remove_proc_entry(RTL8187_MODULE_NAME, init_net.proc_net);
+#endif
 }
 
 
@@ -2602 +2610 @@
 
         dev = alloc_ieee80211_rtl7(sizeof(struct r8180_priv));
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
         SET_MODULE_OWNER(dev);
+#endif
         usb_set_intfdata(intf, dev);
 
         SET_NETDEV_DEV(dev, &intf->dev);

ieee80211/ieee80211_crypt_tkip.c

@@ -394 +394 @@
 #else
         crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);
 #endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = len + 4;
+#else
+        sg_set_page(&sg, virt_to_page(pos), len + 2, offset_in_page(pos));
+#endif
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
         crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4);
 #else
@@ -484 +488 @@
 #else
         crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
 #endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = plen + 4;
+#else
+        sg_set_page(&sg, virt_to_page(pos), plen + 4, offset_in_page(pos));
+#endif
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
         crypto_cipher_decrypt(tkey->tfm_arc4, &sg, &sg, plen + 4);
 #else
@@ -544 +552 @@
                 printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
                 return -1;
         }
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
         sg[0].page = virt_to_page(hdr);
         sg[0].offset = offset_in_page(hdr);
         sg[0].length = 16;
+#else
+        sg_set_page(&sg[0], virt_to_page(hdr), 16, offset_in_page(hdr));
+#endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
         sg[1].page = virt_to_page(data);
         sg[1].offset = offset_in_page(data);
         sg[1].length = data_len;
+#else
+        sg_set_page(&sg[1], virt_to_page(data), data_len, offset_in_page(data));
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
         crypto_digest_init(tkey->tfm_michael);

ieee80211/ieee80211_crypt_wep.c

@@ -190 +190 @@
 #else
         crypto_blkcipher_setkey(wep->tx_tfm, key, klen);
 #endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = len + 4;
+#else
+        sg_set_page(&sg, virt_to_page(pos), len + 4, offset_in_page(pos));
+#endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
         crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4);
@@ -246 +250 @@
         crypto_blkcipher_setkey(wep->rx_tfm, key, klen);
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
         sg.page = virt_to_page(pos);
         sg.offset = offset_in_page(pos);
         sg.length = plen + 4;
+#else
+        sg_set_page(&sg, virt_to_page(pos), plen + 4, offset_in_page(pos));
+#endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
         crypto_cipher_decrypt(wep->tfm, &sg, &sg, plen + 4);