diff options
Diffstat (limited to 'drivers/net/benet/be_main.c')
-rw-r--r-- | drivers/net/benet/be_main.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 9c8654d9c508..ab5fcc0c5b19 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -66,15 +66,14 @@ static void be_intr_set(struct be_adapter *adapter, bool enable) | |||
66 | u8 __iomem *addr = adapter->pcicfg + PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET; | 66 | u8 __iomem *addr = adapter->pcicfg + PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET; |
67 | u32 reg = ioread32(addr); | 67 | u32 reg = ioread32(addr); |
68 | u32 enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; | 68 | u32 enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; |
69 | if (!enabled && enable) { | 69 | |
70 | if (!enabled && enable) | ||
70 | reg |= MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; | 71 | reg |= MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; |
71 | } else if (enabled && !enable) { | 72 | else if (enabled && !enable) |
72 | reg &= ~MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; | 73 | reg &= ~MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; |
73 | } else { | 74 | else |
74 | printk(KERN_WARNING DRV_NAME | ||
75 | ": bad value in membar_int_ctrl reg=0x%x\n", reg); | ||
76 | return; | 75 | return; |
77 | } | 76 | |
78 | iowrite32(reg, addr); | 77 | iowrite32(reg, addr); |
79 | } | 78 | } |
80 | 79 | ||
@@ -1981,12 +1980,6 @@ static int __init be_init_module(void) | |||
1981 | " Using 2048\n"); | 1980 | " Using 2048\n"); |
1982 | rx_frag_size = 2048; | 1981 | rx_frag_size = 2048; |
1983 | } | 1982 | } |
1984 | /* Ensure rx_frag_size is aligned to chache line */ | ||
1985 | if (SKB_DATA_ALIGN(rx_frag_size) != rx_frag_size) { | ||
1986 | printk(KERN_WARNING DRV_NAME | ||
1987 | " : Bad module param rx_frag_size. Using 2048\n"); | ||
1988 | rx_frag_size = 2048; | ||
1989 | } | ||
1990 | 1983 | ||
1991 | return pci_register_driver(&be_driver); | 1984 | return pci_register_driver(&be_driver); |
1992 | } | 1985 | } |