ocf: switch MODULE_LICENSE from BSD to "Dual BSD/GPL" to make the kernel recognize...

[15.05/openwrt.git] / target / linux / generic / files / crypto / ocf / ubsec_ssb / ubsec_ssb.c

diff --git a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
index aa0733f..6dc22c7 100644 (file)
--- a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
+++ b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
@@ -104,9 +104,9 @@
  * Prototypes 
  */
 static irqreturn_t ubsec_ssb_isr(int, void *, struct pt_regs *);
-static int __devinit ubsec_ssb_probe(struct ssb_device *sdev,
+static int ubsec_ssb_probe(struct ssb_device *sdev,
     const struct ssb_device_id *ent);
-static void __devexit ubsec_ssb_remove(struct ssb_device *sdev);
+static void ubsec_ssb_remove(struct ssb_device *sdev);
 int ubsec_attach(struct ssb_device *sdev, const struct ssb_device_id *ent, 
     struct device *self);
 static void ubsec_setup_mackey(struct ubsec_session *ses, int algo, 
@@ -185,7 +185,7 @@ static struct ssb_driver ubsec_ssb_driver = {
     .name       = DRV_MODULE_NAME,
     .id_table   = ubsec_ssb_tbl,
     .probe      = ubsec_ssb_probe,
-    .remove     = __devexit_p(ubsec_ssb_remove),
+    .remove     = ubsec_ssb_remove,
      /*
     .suspend    = ubsec_ssb_suspend,
     .resume     = ubsec_ssb_resume
@@ -297,18 +297,18 @@ dma_map_skb(struct ubsec_softc *sc, struct ubsec_dma_alloc* q_map, struct sk_buf
 
 #ifdef UBSEC_VERBOSE_DEBUG
         DPRINTF("%s - map %d 0x%x %d\n", __FUNCTION__, i + 1, 
-            (unsigned int)page_address(skb_shinfo(skb)->frags[i].page) +
+            (unsigned int)page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
             skb_shinfo(skb)->frags[i].page_offset, skb_shinfo(skb)->frags[i].size);
 #endif
 
         tmp = dma_map_single(sc->sc_dv,
-                             page_address(skb_shinfo(skb)->frags[i].page) +
+                             page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
                                  skb_shinfo(skb)->frags[i].page_offset, 
                              skb_shinfo(skb)->frags[i].size,
                              DMA_BIDIRECTIONAL);
 
         q_map[i + 1].dma_paddr = tmp;
-        q_map[i + 1].dma_vaddr = (void*)(page_address(skb_shinfo(skb)->frags[i].page) +
+        q_map[i + 1].dma_vaddr = (void*)(page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) +
                                   skb_shinfo(skb)->frags[i].page_offset);
         q_map[i + 1].dma_size = skb_shinfo(skb)->frags[i].size;
 
@@ -482,8 +482,8 @@ ubsec_setup_mackey(struct ubsec_session *ses, int algo, caddr_t key, int klen)
 }
 #undef N
 
-static int 
-__devinit ubsec_ssb_probe(struct ssb_device *sdev, 
+static int
+ubsec_ssb_probe(struct ssb_device *sdev, 
     const struct ssb_device_id *ent) 
 {
     int err;
@@ -553,7 +553,7 @@ err_out:
     return err;
 }
 
-static void __devexit ubsec_ssb_remove(struct ssb_device *sdev) {
+static void ubsec_ssb_remove(struct ssb_device *sdev) {
 
     struct ubsec_softc *sc;
     unsigned int ctrlflgs;
@@ -2214,7 +2214,7 @@ module_exit(mod_exit);
 
 // Meta information
 MODULE_AUTHOR("Daniel Mueller <daniel@danm.de>");
-MODULE_LICENSE("BSD");
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DESCRIPTION("OCF driver for BCM5365P IPSec Core");
 MODULE_VERSION(DRV_MODULE_VERSION);