]> bbs.cooldavid.org Git - jme.git/blobdiff - jme.c
net: drivers: use bool type instead of double negation
[jme.git] / jme.c
diff --git a/jme.c b/jme.c
index c62014dcecebd39ab83d94b3b5f453076d6bfcd6..40cab5b0c0e2eb09367d6a03cd0b41bd9a9755b8 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -782,7 +782,12 @@ jme_make_new_rx_buf(struct jme_adapter *jme, int i)
        mapping = pci_map_page(jme->pdev, virt_to_page(skb->data),
                               offset_in_page(skb->data), skb_tailroom(skb),
                               PCI_DMA_FROMDEVICE);
-       if (unlikely(pci_dma_mapping_error(jme->pdev, mapping))) {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
+       if (unlikely(pci_dma_mapping_error(jme->pdev, mapping)))
+#else
+       if (unlikely(pci_dma_mapping_error(mapping)))
+#endif
+       {
                dev_kfree_skb(skb);
                return -ENOMEM;
        }
@@ -1957,7 +1962,7 @@ jme_fill_tx_map(struct pci_dev *pdev,
                struct page *page,
                u32 page_offset,
                u32 len,
-               u8 hidma)
+               bool hidma)
 {
        dma_addr_t dmaaddr;
 
@@ -1991,7 +1996,7 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)
        struct jme_ring *txring = &(jme->txring[0]);
        struct txdesc *txdesc = txring->desc, *ctxdesc;
        struct jme_buffer_info *txbi = txring->bufinf, *ctxbi;
-       u8 hidma = !!(jme->dev->features & NETIF_F_HIGHDMA);
+       bool hidma = jme->dev->features & NETIF_F_HIGHDMA;
        int i, nr_frags = skb_shinfo(skb)->nr_frags;
        int mask = jme->tx_ring_mask;
        const struct skb_frag_struct *frag;