X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fs2io.c;h=c4bd1793f99320f57c396c649958edefe1d8a7f7;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=022e32246a2cd90d240446a69bb1f4cfb3b6406e;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 022e32246..c4bd1793f 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -99,45 +99,45 @@ static char s2io_gstrings[][ETH_GSTRING_LEN] = { }; static char ethtool_stats_keys[][ETH_GSTRING_LEN] = { - {"tmac_frms"}, - {"tmac_data_octets"}, - {"tmac_drop_frms"}, - {"tmac_mcst_frms"}, - {"tmac_bcst_frms"}, - {"tmac_pause_ctrl_frms"}, - {"tmac_any_err_frms"}, - {"tmac_vld_ip_octets"}, - {"tmac_vld_ip"}, - {"tmac_drop_ip"}, - {"tmac_icmp"}, - {"tmac_rst_tcp"}, - {"tmac_tcp"}, - {"tmac_udp"}, - {"rmac_vld_frms"}, - {"rmac_data_octets"}, - {"rmac_fcs_err_frms"}, - {"rmac_drop_frms"}, - {"rmac_vld_mcst_frms"}, - {"rmac_vld_bcst_frms"}, - {"rmac_in_rng_len_err_frms"}, - {"rmac_long_frms"}, - {"rmac_pause_ctrl_frms"}, - {"rmac_discarded_frms"}, - {"rmac_usized_frms"}, - {"rmac_osized_frms"}, - {"rmac_frag_frms"}, - {"rmac_jabber_frms"}, - {"rmac_ip"}, - {"rmac_ip_octets"}, - {"rmac_hdr_err_ip"}, - {"rmac_drop_ip"}, - {"rmac_icmp"}, - {"rmac_tcp"}, - {"rmac_udp"}, - {"rmac_err_drp_udp"}, - {"rmac_pause_cnt"}, - {"rmac_accepted_ip"}, - {"rmac_err_tcp"}, + "tmac_frms", + "tmac_data_octets", + "tmac_drop_frms", + "tmac_mcst_frms", + "tmac_bcst_frms", + "tmac_pause_ctrl_frms", + "tmac_any_err_frms", + "tmac_vld_ip_octets", + "tmac_vld_ip", + "tmac_drop_ip", + "tmac_icmp", + "tmac_rst_tcp", + "tmac_tcp", + "tmac_udp", + "rmac_vld_frms", + "rmac_data_octets", + "rmac_fcs_err_frms", + "rmac_drop_frms", + "rmac_vld_mcst_frms", + "rmac_vld_bcst_frms", + "rmac_in_rng_len_err_frms", + "rmac_long_frms", + "rmac_pause_ctrl_frms", + "rmac_discarded_frms", + "rmac_usized_frms", + "rmac_osized_frms", + "rmac_frag_frms", + "rmac_jabber_frms", + "rmac_ip", + "rmac_ip_octets", + "rmac_hdr_err_ip", + "rmac_drop_ip", + "rmac_icmp", + "rmac_tcp", + "rmac_udp", + "rmac_err_drp_udp", + "rmac_pause_cnt", + "rmac_accepted_ip", + "rmac_err_tcp", }; #define S2IO_STAT_LEN sizeof(ethtool_stats_keys)/ ETH_GSTRING_LEN @@ -238,7 +238,7 @@ static struct pci_driver s2io_driver = { name:"S2IO", id_table:s2io_tbl, probe:s2io_init_nic, - remove:s2io_rem_nic, + remove:__devexit_p(s2io_rem_nic), }; /* @@ -1425,13 +1425,13 @@ int fill_rx_buffers(struct s2io_nic *nic, int ring_no) goto end; } - skb = dev_alloc_skb(size + HEADER_ALIGN_LAYER_3); + skb = dev_alloc_skb(size + NET_IP_ALIGN); if (!skb) { DBG_PRINT(ERR_DBG, "%s: Out of ", dev->name); DBG_PRINT(ERR_DBG, "memory to allocate SKBs\n"); return -ENOMEM; } - skb_reserve(skb, HEADER_ALIGN_LAYER_3); + skb_reserve(skb, NET_IP_ALIGN); memset(rxdp, 0, sizeof(RxD_t)); rxdp->Buffer0_ptr = pci_map_single (nic->pdev, skb->data, size, PCI_DMA_FROMDEVICE); @@ -2339,9 +2339,6 @@ static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs) struct net_device *dev = (struct net_device *) dev_id; nic_t *sp = dev->priv; XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0; -#ifndef CONFIG_S2IO_NAPI - int i, ret; -#endif u64 reason = 0, general_mask = 0; mac_info_t *mac_control; struct config_param *config; @@ -4358,7 +4355,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) * and free up all resource held up by the device. This could be in response * to a Hot plug event or when the driver is to be removed from memory. */ -static void __exit s2io_rem_nic(struct pci_dev *pdev) +static void __devexit s2io_rem_nic(struct pci_dev *pdev) { struct net_device *dev = (struct net_device *) pci_get_drvdata(pdev);