Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171483
b: refs/heads/master
c: 8cbd962
h: refs/heads/master
i:
  171481: 22e940a
  171479: 0031bc3
v: v3
  • Loading branch information
Marin Mitov authored and David S. Miller committed Nov 11, 2009
1 parent afd820e commit dc4d62a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30fff9231fad757c061285e347b33c5149c2c2e4
refs/heads/master: 8cbd9623da7e7a99c6bd0f0b7d21d17c233c6abb
6 changes: 1 addition & 5 deletions trunk/drivers/net/niu.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ MODULE_DESCRIPTION("NIU ethernet driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_MODULE_VERSION);

#ifndef DMA_44BIT_MASK
#define DMA_44BIT_MASK 0x00000fffffffffffULL
#endif

#ifndef readq
static u64 readq(void __iomem *reg)
{
Expand Down Expand Up @@ -9918,7 +9914,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
PCI_EXP_DEVCTL_RELAX_EN);
pci_write_config_word(pdev, pos + PCI_EXP_DEVCTL, val16);

dma_mask = DMA_44BIT_MASK;
dma_mask = DMA_BIT_MASK(44);
err = pci_set_dma_mask(pdev, dma_mask);
if (!err) {
dev->features |= NETIF_F_HIGHDMA;
Expand Down

0 comments on commit dc4d62a

Please sign in to comment.