Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 215faf9c 编写于 作者: J Joe Perches
浏览文件
操作

drivers/net/*/: Use static const 

Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Signed-off-by: NJoe Perches <joe@perches.com>
上级 75a84eb5
隐藏空白更改
内联 并排
Showing with 84 addition and 65 deletion
drivers/net/benet/be_ethtool.c
浏览文件 @ 215faf9c
...@@ -549,7 +549,9 @@ be_test_ddr_dma(struct be_adapter *adapter) ...@@ -549,7 +549,9 @@ be_test_ddr_dma(struct be_adapter *adapter)
{ {
int ret, i; int ret, i;
struct be_dma_mem ddrdma_cmd; struct be_dma_mem ddrdma_cmd;
u64 pattern[2] = {0x5a5a5a5a5a5a5a5aULL, 0xa5a5a5a5a5a5a5a5ULL}; static const u64 pattern[2] = {
0x5a5a5a5a5a5a5a5aULL, 0xa5a5a5a5a5a5a5a5ULL
};
ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test); ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size, ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,
......
drivers/net/benet/be_main.c
浏览文件 @ 215faf9c
...@@ -2398,10 +2398,10 @@ static int be_flash_data(struct be_adapter *adapter, ...@@ -2398,10 +2398,10 @@ static int be_flash_data(struct be_adapter *adapter,
int num_bytes; int num_bytes;
const u8 *p = fw->data; const u8 *p = fw->data;
struct be_cmd_write_flashrom *req = flash_cmd->va; struct be_cmd_write_flashrom *req = flash_cmd->va;
struct flash_comp *pflashcomp; const struct flash_comp *pflashcomp;
int num_comp; int num_comp;
struct flash_comp gen3_flash_types[9] = { static const struct flash_comp gen3_flash_types[9] = {
{ FLASH_iSCSI_PRIMARY_IMAGE_START_g3, IMG_TYPE_ISCSI_ACTIVE, { FLASH_iSCSI_PRIMARY_IMAGE_START_g3, IMG_TYPE_ISCSI_ACTIVE,
FLASH_IMAGE_MAX_SIZE_g3}, FLASH_IMAGE_MAX_SIZE_g3},
{ FLASH_REDBOOT_START_g3, IMG_TYPE_REDBOOT, { FLASH_REDBOOT_START_g3, IMG_TYPE_REDBOOT,
...@@ -2421,7 +2421,7 @@ static int be_flash_data(struct be_adapter *adapter, ...@@ -2421,7 +2421,7 @@ static int be_flash_data(struct be_adapter *adapter,
{ FLASH_NCSI_START_g3, IMG_TYPE_NCSI_FW, { FLASH_NCSI_START_g3, IMG_TYPE_NCSI_FW,
FLASH_NCSI_IMAGE_MAX_SIZE_g3} FLASH_NCSI_IMAGE_MAX_SIZE_g3}
}; };
struct flash_comp gen2_flash_types[8] = { static const struct flash_comp gen2_flash_types[8] = {
{ FLASH_iSCSI_PRIMARY_IMAGE_START_g2, IMG_TYPE_ISCSI_ACTIVE, { FLASH_iSCSI_PRIMARY_IMAGE_START_g2, IMG_TYPE_ISCSI_ACTIVE,
FLASH_IMAGE_MAX_SIZE_g2}, FLASH_IMAGE_MAX_SIZE_g2},
{ FLASH_REDBOOT_START_g2, IMG_TYPE_REDBOOT, { FLASH_REDBOOT_START_g2, IMG_TYPE_REDBOOT,
...@@ -2443,11 +2443,11 @@ static int be_flash_data(struct be_adapter *adapter, ...@@ -2443,11 +2443,11 @@ static int be_flash_data(struct be_adapter *adapter,
if (adapter->generation == BE_GEN3) { if (adapter->generation == BE_GEN3) {
pflashcomp = gen3_flash_types; pflashcomp = gen3_flash_types;
filehdr_size = sizeof(struct flash_file_hdr_g3); filehdr_size = sizeof(struct flash_file_hdr_g3);
num_comp = 9; num_comp = ARRAY_SIZE(gen3_flash_types);
} else { } else {
pflashcomp = gen2_flash_types; pflashcomp = gen2_flash_types;
filehdr_size = sizeof(struct flash_file_hdr_g2); filehdr_size = sizeof(struct flash_file_hdr_g2);
num_comp = 8; num_comp = ARRAY_SIZE(gen2_flash_types);
} }
for (i = 0; i < num_comp; i++) { for (i = 0; i < num_comp; i++) {
if ((pflashcomp[i].optype == IMG_TYPE_NCSI_FW) && if ((pflashcomp[i].optype == IMG_TYPE_NCSI_FW) &&
......
drivers/net/bnx2x/bnx2x_main.c
浏览文件 @ 215faf9c
...@@ -6208,7 +6208,7 @@ static int bnx2x_func_stop(struct bnx2x *bp) ...@@ -6208,7 +6208,7 @@ static int bnx2x_func_stop(struct bnx2x *bp)
* @param cam_offset offset in a CAM to use * @param cam_offset offset in a CAM to use
* @param is_bcast is the set MAC a broadcast address (for E1 only) * @param is_bcast is the set MAC a broadcast address (for E1 only)
*/ */
static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, u8 *mac, static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
u32 cl_bit_vec, u8 cam_offset, u32 cl_bit_vec, u8 cam_offset,
u8 is_bcast) u8 is_bcast)
{ {
...@@ -6400,7 +6400,9 @@ void bnx2x_set_eth_mac(struct bnx2x *bp, int set) ...@@ -6400,7 +6400,9 @@ void bnx2x_set_eth_mac(struct bnx2x *bp, int set)
if (CHIP_IS_E1(bp)) { if (CHIP_IS_E1(bp)) {
/* broadcast MAC */ /* broadcast MAC */
u8 bcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static const u8 bcast[ETH_ALEN] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
bnx2x_set_mac_addr_gen(bp, set, bcast, 0, cam_offset + 1, 1); bnx2x_set_mac_addr_gen(bp, set, bcast, 0, cam_offset + 1, 1);
} }
} }
......
drivers/net/can/sja1000/plx_pci.c
浏览文件 @ 215faf9c
...@@ -383,7 +383,7 @@ static void plx_pci_reset_marathon(struct pci_dev *pdev) ...@@ -383,7 +383,7 @@ static void plx_pci_reset_marathon(struct pci_dev *pdev)
{ {
void __iomem *reset_addr; void __iomem *reset_addr;
int i; int i;
int reset_bar[2] = {3, 5}; static const int reset_bar[2] = {3, 5};
plx_pci_reset_common(pdev); plx_pci_reset_common(pdev);
......
drivers/net/chelsio/sge.c
浏览文件 @ 215faf9c
...@@ -273,6 +273,10 @@ struct sge { ...@@ -273,6 +273,10 @@ struct sge {
struct cmdQ cmdQ[SGE_CMDQ_N] ____cacheline_aligned_in_smp; struct cmdQ cmdQ[SGE_CMDQ_N] ____cacheline_aligned_in_smp;
}; };
static const u8 ch_mac_addr[ETH_ALEN] = {
0x0, 0x7, 0x43, 0x0, 0x0, 0x0
};
/* /*
* stop tasklet and free all pending skb's * stop tasklet and free all pending skb's
*/ */
...@@ -2012,10 +2016,6 @@ static void espibug_workaround_t204(unsigned long data) ...@@ -2012,10 +2016,6 @@ static void espibug_workaround_t204(unsigned long data)
continue; continue;
if (!skb->cb[0]) { if (!skb->cb[0]) {
u8 ch_mac_addr[ETH_ALEN] = {
0x0, 0x7, 0x43, 0x0, 0x0, 0x0
};
skb_copy_to_linear_data_offset(skb, skb_copy_to_linear_data_offset(skb,
sizeof(struct cpl_tx_pkt), sizeof(struct cpl_tx_pkt),
ch_mac_addr, ch_mac_addr,
...@@ -2048,8 +2048,6 @@ static void espibug_workaround(unsigned long data) ...@@ -2048,8 +2048,6 @@ static void espibug_workaround(unsigned long data)
if ((seop & 0xfff0fff) == 0xfff && skb) { if ((seop & 0xfff0fff) == 0xfff && skb) {
if (!skb->cb[0]) { if (!skb->cb[0]) {
u8 ch_mac_addr[ETH_ALEN] =
{0x0, 0x7, 0x43, 0x0, 0x0, 0x0};
skb_copy_to_linear_data_offset(skb, skb_copy_to_linear_data_offset(skb,
sizeof(struct cpl_tx_pkt), sizeof(struct cpl_tx_pkt),
ch_mac_addr, ch_mac_addr,
......
drivers/net/cxgb3/ael1002.c
浏览文件 @ 215faf9c
...@@ -292,7 +292,7 @@ static int ael2xxx_get_module_type(struct cphy *phy, int delay_ms) ...@@ -292,7 +292,7 @@ static int ael2xxx_get_module_type(struct cphy *phy, int delay_ms)
*/ */
static int ael2005_setup_sr_edc(struct cphy *phy) static int ael2005_setup_sr_edc(struct cphy *phy)
{ {
static struct reg_val regs[] = { static const struct reg_val regs[] = {
{ MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x181 }, { MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x181 },
{ MDIO_MMD_PMAPMD, 0xc010, 0xffff, 0x448a }, { MDIO_MMD_PMAPMD, 0xc010, 0xffff, 0x448a },
{ MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5200 }, { MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5200 },
...@@ -324,11 +324,11 @@ static int ael2005_setup_sr_edc(struct cphy *phy) ...@@ -324,11 +324,11 @@ static int ael2005_setup_sr_edc(struct cphy *phy)
static int ael2005_setup_twinax_edc(struct cphy *phy, int modtype) static int ael2005_setup_twinax_edc(struct cphy *phy, int modtype)
{ {
static struct reg_val regs[] = { static const struct reg_val regs[] = {
{ MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5a00 }, { MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5a00 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
static struct reg_val preemphasis[] = { static const struct reg_val preemphasis[] = {
{ MDIO_MMD_PMAPMD, 0xc014, 0xffff, 0xfe16 }, { MDIO_MMD_PMAPMD, 0xc014, 0xffff, 0xfe16 },
{ MDIO_MMD_PMAPMD, 0xc015, 0xffff, 0xa000 }, { MDIO_MMD_PMAPMD, 0xc015, 0xffff, 0xa000 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
...@@ -393,7 +393,7 @@ static int ael2005_intr_clear(struct cphy *phy) ...@@ -393,7 +393,7 @@ static int ael2005_intr_clear(struct cphy *phy)
static int ael2005_reset(struct cphy *phy, int wait) static int ael2005_reset(struct cphy *phy, int wait)
{ {
static struct reg_val regs0[] = { static const struct reg_val regs0[] = {
{ MDIO_MMD_PMAPMD, 0xc001, 0, 1 << 5 }, { MDIO_MMD_PMAPMD, 0xc001, 0, 1 << 5 },
{ MDIO_MMD_PMAPMD, 0xc017, 0, 1 << 5 }, { MDIO_MMD_PMAPMD, 0xc017, 0, 1 << 5 },
{ MDIO_MMD_PMAPMD, 0xc013, 0xffff, 0xf341 }, { MDIO_MMD_PMAPMD, 0xc013, 0xffff, 0xf341 },
...@@ -403,7 +403,7 @@ static int ael2005_reset(struct cphy *phy, int wait) ...@@ -403,7 +403,7 @@ static int ael2005_reset(struct cphy *phy, int wait)
{ MDIO_MMD_PMAPMD, 0xc210, 0xffff, 0 }, { MDIO_MMD_PMAPMD, 0xc210, 0xffff, 0 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
static struct reg_val regs1[] = { static const struct reg_val regs1[] = {
{ MDIO_MMD_PMAPMD, 0xca00, 0xffff, 0x0080 }, { MDIO_MMD_PMAPMD, 0xca00, 0xffff, 0x0080 },
{ MDIO_MMD_PMAPMD, 0xca12, 0xffff, 0 }, { MDIO_MMD_PMAPMD, 0xca12, 0xffff, 0 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
...@@ -522,7 +522,7 @@ int t3_ael2005_phy_prep(struct cphy *phy, struct adapter *adapter, ...@@ -522,7 +522,7 @@ int t3_ael2005_phy_prep(struct cphy *phy, struct adapter *adapter,
*/ */
static int ael2020_setup_sr_edc(struct cphy *phy) static int ael2020_setup_sr_edc(struct cphy *phy)
{ {
static struct reg_val regs[] = { static const struct reg_val regs[] = {
/* set CDR offset to 10 */ /* set CDR offset to 10 */
{ MDIO_MMD_PMAPMD, 0xcc01, 0xffff, 0x488a }, { MDIO_MMD_PMAPMD, 0xcc01, 0xffff, 0x488a },
...@@ -551,20 +551,20 @@ static int ael2020_setup_sr_edc(struct cphy *phy) ...@@ -551,20 +551,20 @@ static int ael2020_setup_sr_edc(struct cphy *phy)
static int ael2020_setup_twinax_edc(struct cphy *phy, int modtype) static int ael2020_setup_twinax_edc(struct cphy *phy, int modtype)
{ {
/* set uC to 40MHz */ /* set uC to 40MHz */
static struct reg_val uCclock40MHz[] = { static const struct reg_val uCclock40MHz[] = {
{ MDIO_MMD_PMAPMD, 0xff28, 0xffff, 0x4001 }, { MDIO_MMD_PMAPMD, 0xff28, 0xffff, 0x4001 },
{ MDIO_MMD_PMAPMD, 0xff2a, 0xffff, 0x0002 }, { MDIO_MMD_PMAPMD, 0xff2a, 0xffff, 0x0002 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
/* activate uC clock */ /* activate uC clock */
static struct reg_val uCclockActivate[] = { static const struct reg_val uCclockActivate[] = {
{ MDIO_MMD_PMAPMD, 0xd000, 0xffff, 0x5200 }, { MDIO_MMD_PMAPMD, 0xd000, 0xffff, 0x5200 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
/* set PC to start of SRAM and activate uC */ /* set PC to start of SRAM and activate uC */
static struct reg_val uCactivate[] = { static const struct reg_val uCactivate[] = {
{ MDIO_MMD_PMAPMD, 0xd080, 0xffff, 0x0100 }, { MDIO_MMD_PMAPMD, 0xd080, 0xffff, 0x0100 },
{ MDIO_MMD_PMAPMD, 0xd092, 0xffff, 0x0000 }, { MDIO_MMD_PMAPMD, 0xd092, 0xffff, 0x0000 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
...@@ -624,7 +624,7 @@ static int ael2020_get_module_type(struct cphy *phy, int delay_ms) ...@@ -624,7 +624,7 @@ static int ael2020_get_module_type(struct cphy *phy, int delay_ms)
*/ */
static int ael2020_intr_enable(struct cphy *phy) static int ael2020_intr_enable(struct cphy *phy)
{ {
struct reg_val regs[] = { static const struct reg_val regs[] = {
/* output Module's Loss Of Signal (LOS) to LED */ /* output Module's Loss Of Signal (LOS) to LED */
{ MDIO_MMD_PMAPMD, AEL2020_GPIO_CFG+AEL2020_GPIO_LSTAT, { MDIO_MMD_PMAPMD, AEL2020_GPIO_CFG+AEL2020_GPIO_LSTAT,
0xffff, 0x4 }, 0xffff, 0x4 },
...@@ -664,7 +664,7 @@ static int ael2020_intr_enable(struct cphy *phy) ...@@ -664,7 +664,7 @@ static int ael2020_intr_enable(struct cphy *phy)
*/ */
static int ael2020_intr_disable(struct cphy *phy) static int ael2020_intr_disable(struct cphy *phy)
{ {
struct reg_val regs[] = { static const struct reg_val regs[] = {
/* reset "link status" LED to "off" */ /* reset "link status" LED to "off" */
{ MDIO_MMD_PMAPMD, AEL2020_GPIO_CTRL, { MDIO_MMD_PMAPMD, AEL2020_GPIO_CTRL,
0xffff, 0xb << (AEL2020_GPIO_LSTAT*4) }, 0xffff, 0xb << (AEL2020_GPIO_LSTAT*4) },
...@@ -701,7 +701,7 @@ static int ael2020_intr_clear(struct cphy *phy) ...@@ -701,7 +701,7 @@ static int ael2020_intr_clear(struct cphy *phy)
return err ? err : t3_phy_lasi_intr_clear(phy); return err ? err : t3_phy_lasi_intr_clear(phy);
} }
static struct reg_val ael2020_reset_regs[] = { static const struct reg_val ael2020_reset_regs[] = {
/* Erratum #2: CDRLOL asserted, causing PMA link down status */ /* Erratum #2: CDRLOL asserted, causing PMA link down status */
{ MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x3101 }, { MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x3101 },
......
drivers/net/cxgb3/t3_hw.c
浏览文件 @ 215faf9c
...@@ -1562,7 +1562,7 @@ static void tp_intr_handler(struct adapter *adapter) ...@@ -1562,7 +1562,7 @@ static void tp_intr_handler(struct adapter *adapter)
{0} {0}
}; };
static struct intr_info tp_intr_info_t3c[] = { static const struct intr_info tp_intr_info_t3c[] = {
{0x1fffffff, "TP parity error", -1, 1}, {0x1fffffff, "TP parity error", -1, 1},
{F_FLMRXFLSTEMPTY, "TP out of Rx pages", -1, 1}, {F_FLMRXFLSTEMPTY, "TP out of Rx pages", -1, 1},
{F_FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1}, {F_FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1},
......
drivers/net/cxgb4vf/t4vf_hw.c
浏览文件 @ 215faf9c
...@@ -116,7 +116,7 @@ static void dump_mbox(struct adapter *adapter, const char *tag, u32 mbox_data) ...@@ -116,7 +116,7 @@ static void dump_mbox(struct adapter *adapter, const char *tag, u32 mbox_data)
int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size, int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,
void *rpl, bool sleep_ok) void *rpl, bool sleep_ok)
{ {
static int delay[] = { static const int delay[] = {
1, 1, 3, 5, 10, 10, 20, 50, 100 1, 1, 3, 5, 10, 10, 20, 50, 100
}; };
......
drivers/net/irda/act200l-sir.c
浏览文件 @ 215faf9c
...@@ -199,7 +199,7 @@ static int act200l_reset(struct sir_dev *dev) ...@@ -199,7 +199,7 @@ static int act200l_reset(struct sir_dev *dev)
{ {
unsigned state = dev->fsm.substate; unsigned state = dev->fsm.substate;
unsigned delay = 0; unsigned delay = 0;
u8 control[9] = { static const u8 control[9] = {
ACT200L_REG15, ACT200L_REG15,
ACT200L_REG13 | ACT200L_SHDW, ACT200L_REG13 | ACT200L_SHDW,
ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL, ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL,
......
drivers/net/irda/donauboe.c
浏览文件 @ 215faf9c
...@@ -818,9 +818,9 @@ toshoboe_probe (struct toshoboe_cb *self) ...@@ -818,9 +818,9 @@ toshoboe_probe (struct toshoboe_cb *self)
{ {
int i, j, n; int i, j, n;
#ifdef USE_MIR #ifdef USE_MIR
int bauds[] = { 9600, 115200, 4000000, 1152000 }; static const int bauds[] = { 9600, 115200, 4000000, 1152000 };
#else #else
int bauds[] = { 9600, 115200, 4000000 }; static const int bauds[] = { 9600, 115200, 4000000 };
#endif #endif
unsigned long flags; unsigned long flags;
......
drivers/net/netxen/netxen_nic_hw.c
浏览文件 @ 215faf9c
...@@ -655,7 +655,7 @@ nx_p3_sre_macaddr_change(struct netxen_adapter *adapter, u8 *addr, unsigned op) ...@@ -655,7 +655,7 @@ nx_p3_sre_macaddr_change(struct netxen_adapter *adapter, u8 *addr, unsigned op)
} }
static int nx_p3_nic_add_mac(struct netxen_adapter *adapter, static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
u8 *addr, struct list_head *del_list) const u8 *addr, struct list_head *del_list)
{ {
struct list_head *head; struct list_head *head;
nx_mac_list_t *cur; nx_mac_list_t *cur;
...@@ -686,7 +686,9 @@ static void netxen_p3_nic_set_multi(struct net_device *netdev) ...@@ -686,7 +686,9 @@ static void netxen_p3_nic_set_multi(struct net_device *netdev)
{ {
struct netxen_adapter *adapter = netdev_priv(netdev); struct netxen_adapter *adapter = netdev_priv(netdev);
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static const u8 bcast_addr[ETH_ALEN] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
u32 mode = VPORT_MISS_MODE_DROP; u32 mode = VPORT_MISS_MODE_DROP;
LIST_HEAD(del_list); LIST_HEAD(del_list);
struct list_head *head; struct list_head *head;
...@@ -869,9 +871,11 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable) ...@@ -869,9 +871,11 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
u64 word; u64 word;
int i, rv; int i, rv;
u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL, static const u64 key[] = {
0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL, 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
0x255b0ec26d5a56daULL }; 0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
0x255b0ec26d5a56daULL
};
memset(&req, 0, sizeof(nx_nic_req_t)); memset(&req, 0, sizeof(nx_nic_req_t));
...@@ -895,7 +899,7 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable) ...@@ -895,7 +899,7 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
((u64)(enable & 0x1) << 8) | ((u64)(enable & 0x1) << 8) |
((0x7ULL) << 48); ((0x7ULL) << 48);
req.words[0] = cpu_to_le64(word); req.words[0] = cpu_to_le64(word);
for (i = 0; i < 5; i++) for (i = 0; i < ARRAY_SIZE(key); i++)
req.words[i+1] = cpu_to_le64(key[i]); req.words[i+1] = cpu_to_le64(key[i]);
......
drivers/net/pcmcia/nmclan_cs.c
浏览文件 @ 215faf9c
...@@ -1291,7 +1291,7 @@ updateCRC ...@@ -1291,7 +1291,7 @@ updateCRC
static void updateCRC(int *CRC, int bit) static void updateCRC(int *CRC, int bit)
{ {
int poly[]={ static const int poly[]={
1,1,1,0, 1,1,0,1, 1,1,1,0, 1,1,0,1,
1,0,1,1, 1,0,0,0, 1,0,1,1, 1,0,0,0,
1,0,0,0, 0,0,1,1, 1,0,0,0, 0,0,1,1,
......
drivers/net/qlcnic/qlcnic_hw.c
浏览文件 @ 215faf9c
...@@ -381,7 +381,7 @@ qlcnic_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr, ...@@ -381,7 +381,7 @@ qlcnic_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
return qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); return qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
} }
static int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, u8 *addr) static int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr)
{ {
struct list_head *head; struct list_head *head;
struct qlcnic_mac_list_s *cur; struct qlcnic_mac_list_s *cur;
...@@ -415,7 +415,9 @@ void qlcnic_set_multi(struct net_device *netdev) ...@@ -415,7 +415,9 @@ void qlcnic_set_multi(struct net_device *netdev)
{ {
struct qlcnic_adapter *adapter = netdev_priv(netdev); struct qlcnic_adapter *adapter = netdev_priv(netdev);
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static const u8 bcast_addr[ETH_ALEN] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
u32 mode = VPORT_MISS_MODE_DROP; u32 mode = VPORT_MISS_MODE_DROP;
if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state)) if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
...@@ -621,10 +623,11 @@ int qlcnic_config_rss(struct qlcnic_adapter *adapter, int enable) ...@@ -621,10 +623,11 @@ int qlcnic_config_rss(struct qlcnic_adapter *adapter, int enable)
u64 word; u64 word;
int i, rv; int i, rv;
const u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL, static const u64 key[] = {
0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL, 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
0x255b0ec26d5a56daULL }; 0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
0x255b0ec26d5a56daULL
};
memset(&req, 0, sizeof(struct qlcnic_nic_req)); memset(&req, 0, sizeof(struct qlcnic_nic_req));
req.qhdr = cpu_to_le64(QLCNIC_HOST_REQUEST << 23); req.qhdr = cpu_to_le64(QLCNIC_HOST_REQUEST << 23);
......
drivers/net/qlge/qlge_main.c
浏览文件 @ 215faf9c
...@@ -3548,12 +3548,13 @@ static int ql_request_irq(struct ql_adapter *qdev) ...@@ -3548,12 +3548,13 @@ static int ql_request_irq(struct ql_adapter *qdev)
static int ql_start_rss(struct ql_adapter *qdev) static int ql_start_rss(struct ql_adapter *qdev)
{ {
u8 init_hash_seed[] = {0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, static const u8 init_hash_seed[] = {
0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
0xb0, 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
0x30, 0xb4, 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
0x30, 0xf2, 0x0c, 0x6a, 0x42, 0xb7, 0x3b, 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
0xbe, 0xac, 0x01, 0xfa}; 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
};
struct ricb *ricb = &qdev->ricb; struct ricb *ricb = &qdev->ricb;
int status = 0; int status = 0;
int i; int i;
......
drivers/net/skfp/smt.c
浏览文件 @ 215faf9c
...@@ -1263,7 +1263,7 @@ void smt_set_timestamp(struct s_smc *smc, u_char *p) ...@@ -1263,7 +1263,7 @@ void smt_set_timestamp(struct s_smc *smc, u_char *p)
static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy) static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy)
{ {
int i ; int i ;
u_char *map ; const u_char *map ;
u_short in ; u_short in ;
u_short out ; u_short out ;
...@@ -1271,7 +1271,7 @@ static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy) ...@@ -1271,7 +1271,7 @@ static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy)
* MIB para 101b (fddiSMTConnectionPolicy) coding * MIB para 101b (fddiSMTConnectionPolicy) coding
* is different from 0005 coding * is different from 0005 coding
*/ */
static u_char ansi_weirdness[16] = { static const u_char ansi_weirdness[16] = {
0,7,5,3,8,1,6,4,9,10,2,11,12,13,14,15 0,7,5,3,8,1,6,4,9,10,2,11,12,13,14,15
} ; } ;
SMTSETPARA(policy,SMT_P_POLICY) ; SMTSETPARA(policy,SMT_P_POLICY) ;
......
drivers/net/tokenring/ibmtr.c
浏览文件 @ 215faf9c
...@@ -657,8 +657,9 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) ...@@ -657,8 +657,9 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
#ifndef PCMCIA #ifndef PCMCIA
/* finish figuring the shared RAM address */ /* finish figuring the shared RAM address */
if (cardpresent == TR_ISA) { if (cardpresent == TR_ISA) {
static __u32 ram_bndry_mask[] = static const __u32 ram_bndry_mask[] = {
{ 0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000 }; 0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000
};
__u32 new_base, rrr_32, chk_base, rbm; __u32 new_base, rrr_32, chk_base, rbm;
rrr_32=readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_ODD) >> 2 & 0x03; rrr_32=readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_ODD) >> 2 & 0x03;
......
drivers/net/tulip/de2104x.c
浏览文件 @ 215faf9c
...@@ -964,7 +964,7 @@ static void de_set_media (struct de_private *de) ...@@ -964,7 +964,7 @@ static void de_set_media (struct de_private *de)
dw32(MacMode, macmode); dw32(MacMode, macmode);
} }
static void de_next_media (struct de_private *de, u32 *media, static void de_next_media (struct de_private *de, const u32 *media,
unsigned int n_media) unsigned int n_media)
{ {
unsigned int i; unsigned int i;
...@@ -1008,10 +1008,10 @@ static void de21040_media_timer (unsigned long data) ...@@ -1008,10 +1008,10 @@ static void de21040_media_timer (unsigned long data)
return; return;
if (de->media_type == DE_MEDIA_AUI) { if (de->media_type == DE_MEDIA_AUI) {
u32 next_state = DE_MEDIA_TP; static const u32 next_state = DE_MEDIA_TP;
de_next_media(de, &next_state, 1); de_next_media(de, &next_state, 1);
} else { } else {
u32 next_state = DE_MEDIA_AUI; static const u32 next_state = DE_MEDIA_AUI;
de_next_media(de, &next_state, 1); de_next_media(de, &next_state, 1);
} }
...@@ -1136,13 +1136,19 @@ static void de21041_media_timer (unsigned long data) ...@@ -1136,13 +1136,19 @@ static void de21041_media_timer (unsigned long data)
* simply resets the PHY and reloads the current media settings. * simply resets the PHY and reloads the current media settings.
*/ */
if (de->media_type == DE_MEDIA_AUI) { if (de->media_type == DE_MEDIA_AUI) {
u32 next_states[] = { DE_MEDIA_BNC, DE_MEDIA_TP_AUTO }; static const u32 next_states[] = {
DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
};
de_next_media(de, next_states, ARRAY_SIZE(next_states)); de_next_media(de, next_states, ARRAY_SIZE(next_states));
} else if (de->media_type == DE_MEDIA_BNC) { } else if (de->media_type == DE_MEDIA_BNC) {
u32 next_states[] = { DE_MEDIA_TP_AUTO, DE_MEDIA_AUI }; static const u32 next_states[] = {
DE_MEDIA_TP_AUTO, DE_MEDIA_AUI
};
de_next_media(de, next_states, ARRAY_SIZE(next_states)); de_next_media(de, next_states, ARRAY_SIZE(next_states));
} else { } else {
u32 next_states[] = { DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO }; static const u32 next_states[] = {
DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
};
de_next_media(de, next_states, ARRAY_SIZE(next_states)); de_next_media(de, next_states, ARRAY_SIZE(next_states));
} }
......
drivers/net/vmxnet3/vmxnet3_drv.c
浏览文件 @ 215faf9c
...@@ -1131,7 +1131,9 @@ static int ...@@ -1131,7 +1131,9 @@ static int
vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
struct vmxnet3_adapter *adapter, int quota) struct vmxnet3_adapter *adapter, int quota)
{ {
static u32 rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2}; static const u32 rxprod_reg[2] = {
VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
};
u32 num_rxd = 0; u32 num_rxd = 0;
struct Vmxnet3_RxCompDesc *rcd; struct Vmxnet3_RxCompDesc *rcd;
struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx; struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
......
drivers/net/wan/dscc4.c
浏览文件 @ 215faf9c
...@@ -1358,7 +1358,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1358,7 +1358,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return ret; return ret;
} }
static int dscc4_match(struct thingie *p, int value) static int dscc4_match(const struct thingie *p, int value)
{ {
int i; int i;
...@@ -1403,7 +1403,7 @@ static int dscc4_clock_setting(struct dscc4_dev_priv *dpriv, ...@@ -1403,7 +1403,7 @@ static int dscc4_clock_setting(struct dscc4_dev_priv *dpriv,
static int dscc4_encoding_setting(struct dscc4_dev_priv *dpriv, static int dscc4_encoding_setting(struct dscc4_dev_priv *dpriv,
struct net_device *dev) struct net_device *dev)
{ {
struct thingie encoding[] = { static const struct thingie encoding[] = {
{ ENCODING_NRZ, 0x00000000 }, { ENCODING_NRZ, 0x00000000 },
{ ENCODING_NRZI, 0x00200000 }, { ENCODING_NRZI, 0x00200000 },
{ ENCODING_FM_MARK, 0x00400000 }, { ENCODING_FM_MARK, 0x00400000 },
...@@ -1442,7 +1442,7 @@ static int dscc4_loopback_setting(struct dscc4_dev_priv *dpriv, ...@@ -1442,7 +1442,7 @@ static int dscc4_loopback_setting(struct dscc4_dev_priv *dpriv,
static int dscc4_crc_setting(struct dscc4_dev_priv *dpriv, static int dscc4_crc_setting(struct dscc4_dev_priv *dpriv,
struct net_device *dev) struct net_device *dev)
{ {
struct thingie crc[] = { static const struct thingie crc[] = {
{ PARITY_CRC16_PR0_CCITT, 0x00000010 }, { PARITY_CRC16_PR0_CCITT, 0x00000010 },
{ PARITY_CRC16_PR1_CCITT, 0x00000000 }, { PARITY_CRC16_PR1_CCITT, 0x00000000 },
{ PARITY_CRC32_PR0_CCITT, 0x00000011 }, { PARITY_CRC32_PR0_CCITT, 0x00000011 },
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或