net driver fixes
Subsystems (7)
PATCH 1/1 net driver fixes
Please pull from 'upstream-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/Kconfig | 5 - drivers/net/bonding/bond_main.c | 1 drivers/net/sis190.c | 4 - drivers/net/skge.c | 10 +++ drivers/net/sky2.c | 31 ++++++++++ drivers/net/tokenring/smctr.h | 2 drivers/net/wireless/atmel.c | 98 ++++++++++++++++++++------------- drivers/net/wireless/wavelan_cs.c | 16 +---- drivers/s390/net/lcs.c | 31 +++++----- drivers/s390/net/lcs.h | 2 drivers/s390/net/qeth.h | 112 +++++++++++++++----------------------- drivers/s390/net/qeth_eddp.c | 11 +++ drivers/s390/net/qeth_main.c | 17 ++--- 13 files changed, 189 insertions(+), 151 deletions(-)
Andrew Morton:
smctr warning fix
Dan Williams:
wireless/atmel: fix setting TX key only in ENCODEEXT wireless/atmel: fix Open System authentication process bugs
Francois Romieu:
sis190: early setting of the pci driver private data
Frank Pavlic:
s390: lcs performance enhancements
s390: some qeth driver fixes
Jay Vosburgh:
bonding: fix a locking bug in bond_release
Jean Tourrilhes:
Wavelan_cs bitfield fixes
Stephen Hemminger:
sk98lin: no d-link support (kconfig)
skge: no longer experimental
skge: speed setting
sky2: speed setting fix
drivers/net/Kconfig +2 -3
@@ -2020,8 +2020,8 @@ config SIS190 will be called sis190. This is recommended. config SKGE - tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL + tristate "New SysKonnect GigaEthernet support" + depends on PCI select CRC32 ---help--- This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
@@ -2082,7 +2082,6 @@ config SK98LIN - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter - Allied Telesyn AT-2971T Gigabit Ethernet Adapter - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45 - - DGE-530T Gigabit Ethernet Adapter - EG1032 v2 Instant Gigabit Network Adapter - EG1064 v2 Instant Gigabit Network Adapter - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
drivers/net/bonding/bond_main.c +1 -0
@@ -1581,6 +1581,7 @@ int bond_release(struct net_device *bond printk(KERN_INFO DRV_NAME": %s: %s not enslaved\n" , bond_dev->name, slave_dev->name); +write_unlock_bh (&bond->lock);return -EINVAL ; }
drivers/net/sis190.c +2 -2
@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(str goto out; } +pci_set_drvdata (pdev, dev); + tp =netdev_priv (dev); ioaddr = tp->mmio_addr;
@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(strif (rc <0 ) goto err_remove_mii; -pci_set_drvdata (pdev, dev); - net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", pci_name(pdev), sis_chip_info[ent->driver_data].name,
drivers/net/skge.c +9 -1
@@ -1697,6 +1697,7 @@ static void yukon_mac_init(struct skge_hskge_write32 (hw,SK_REG (port,GPHY_CTRL ), reg |GPC_RST_SET );skge_write32 (hw,SK_REG (port,GPHY_CTRL ), reg |GPC_RST_CLR );skge_write32 (hw,SK_REG (port,GMAC_CTRL ),GMC_PAUSE_ON |GMC_RST_CLR ); +if (skge->autoneg ==AUTONEG_DISABLE ) { reg =GM_GPCR_AU_ALL_DIS ; gma_write16(hw, port, GM_GP_CTRL,
@@ -1704,16 +1705,23 @@ static void yukon_mac_init(struct skge_hswitch (skge->speed) {case SPEED_1000 : + reg &= ~GM_GPCR_SPEED_100 ; reg |=GM_GPCR_SPEED_1000 ; -/* fallthru */ +break ;case SPEED_100 : + reg &= ~GM_GPCR_SPEED_1000 ; reg |=GM_GPCR_SPEED_100 ; +break ; +case SPEED_10 : + reg &= ~(GM_GPCR_SPEED_1000 |GM_GPCR_SPEED_100 ); +break ; }if (skge->duplex ==DUPLEX_FULL ) reg |=GM_GPCR_DUP_FULL ; }else reg =GM_GPCR_SPEED_1000 |GM_GPCR_SPEED_100 |GM_GPCR_DUP_FULL ; +switch (skge->flow_control) {case FLOW_MODE_NONE :skge_write32 (hw,SK_REG (port,GMAC_CTRL ),GMC_PAUSE_OFF );
drivers/net/sky2.c +30 -1
@@ -520,10 +520,16 @@ static void sky2_mac_init(struct sky2_hwswitch (sky2->speed) {case SPEED_1000 : + reg &= ~GM_GPCR_SPEED_100 ; reg |=GM_GPCR_SPEED_1000 ; -/* fallthru */ +break ;case SPEED_100 : + reg &= ~GM_GPCR_SPEED_1000 ; reg |=GM_GPCR_SPEED_100 ; +break ; +case SPEED_10 : + reg &= ~(GM_GPCR_SPEED_1000 |GM_GPCR_SPEED_100 ); +break ; }if (sky2->duplex ==DUPLEX_FULL )
@@ -1446,6 +1452,29 @@ static void sky2_link_up(struct sky2_porsky2_write8 (hw,SK_REG (port,GMAC_IRQ_MSK ),GMAC_DEF_MSK ); reg =gma_read16 (hw, port,GM_GP_CTRL ); +if (sky2->autoneg ==AUTONEG_DISABLE ) { + reg |=GM_GPCR_AU_ALL_DIS ; + +/* Is write/read necessary? Copied from sky2_mac_init */ +gma_write16 (hw, port,GM_GP_CTRL , reg); +gma_read16 (hw, port,GM_GP_CTRL ); + +switch (sky2->speed) { +case SPEED_1000 : + reg &= ~GM_GPCR_SPEED_100 ; + reg |=GM_GPCR_SPEED_1000 ; +break ; +case SPEED_100 : + reg &= ~GM_GPCR_SPEED_1000 ; + reg |=GM_GPCR_SPEED_100 ; +break ; +case SPEED_10 : + reg &= ~(GM_GPCR_SPEED_1000 |GM_GPCR_SPEED_100 ); +break ; + } + }else + reg &= ~GM_GPCR_AU_ALL_DIS ; +if (sky2->duplex ==DUPLEX_FULL || sky2->autoneg ==AUTONEG_ENABLE ) reg |=GM_GPCR_DUP_FULL ;
drivers/net/tokenring/smctr.h +1 -1
@@ -1042,7 +1042,7 @@ typedef struct net_local {__u16 functional_address[2 ];__u16 bitwise_group_address[2 ]; -__u8 *ptr_ucode; +const __u8 *ptr_ucode;__u8 cleanup;
drivers/net/wireless/atmel.c +59 -39
155 lines not on this page · raw message
drivers/net/wireless/wavelan_cs.c +4 -12
@@ -950,16 +950,8 @@ wv_82593_cmd(struct net_device * dev,static inline int wv_diag (struct net_device * dev) { -int ret = FALSE; - -if (wv_82593_cmd (dev,"wv_diag(): diagnose" , -OP0_DIAGNOSE ,SR0_DIAGNOSE_PASSED )) - ret = TRUE; - -#ifdef DEBUG_CONFIG_ERRORS -printk (KERN_INFO "wavelan_cs: i82593 Self Test failed!\n" ); -#endif -return (ret); +return (wv_82593_cmd (dev,"wv_diag(): diagnose" , +OP0_DIAGNOSE ,SR0_DIAGNOSE_PASSED )); }/* wv_diag */ /*------------------------------------------------------------------*/
@@ -3604,8 +3596,8 @@ wv_82593_config(struct net_device * dev) cfblk.lin_prio =0 ;/* conform to 802.3 backoff algoritm */ cfblk.exp_prio =5 ;/* conform to 802.3 backoff algoritm */ cfblk.bof_met =1 ;/* conform to 802.3 backoff algoritm */ - cfblk.ifrm_spc =0x20 ;/* 32 bit times interframe spacing */ - cfblk.slottim_low =0x20 ;/* 32 bit times slot time */ + cfblk.ifrm_spc =0x20 >>4 ;/* 32 bit times interframe spacing */ + cfblk.slottim_low =0x20 >>5 ;/* 32 bit times slot time */ cfblk.slottim_hi =0x0 ; cfblk.max_retr =15 ; cfblk.prmisc = ((lp->promiscuous) ? TRUE: FALSE);/* Promiscuous mode */
drivers/s390/net/lcs.c +17 -14
@@ -98,9 +98,9 @@ lcs_register_debug_facility(void)return -ENOMEM ; }debug_register_view (lcs_dbf_setup, &debug_hex_ascii_view); -debug_set_level (lcs_dbf_setup,4 ); +debug_set_level (lcs_dbf_setup,2 );debug_register_view (lcs_dbf_trace, &debug_hex_ascii_view); -debug_set_level (lcs_dbf_trace,4 ); +debug_set_level (lcs_dbf_trace,2 );return 0 ; }
@@ -1292,9 +1292,8 @@ lcs_set_multicast_list(struct net_deviceLCS_DBF_TEXT (4 , trace,"setmulti" ); card = (struct lcs_card *) dev->priv; -if (!lcs_set_thread_start_bit (card,LCS_SET_MC_THREAD )) { +if (!lcs_set_thread_start_bit (card,LCS_SET_MC_THREAD )) schedule_work(&card->kernel_thread_starter); - } }#endif /* CONFIG_IP_MULTICAST */
@@ -1459,6 +1458,8 @@ lcs_txbuffer_cb(struct lcs_channel *chanlcs_release_buffer (channel, buffer); card = (struct lcs_card *) ((char *) channel - offsetof(struct lcs_card , write)); +if (netif_queue_stopped (card->dev)) +netif_wake_queue (card->dev);spin_lock (&card->lock); card->tx_emitted--;if (card->tx_emitted <=0 && card->tx_buffer !=NULL )
@@ -1478,6 +1479,7 @@ __lcs_start_xmit(struct lcs_card *card, struct net_device *dev) {struct lcs_header *header; +int rc =0 ;LCS_DBF_TEXT (5 , trace,"hardxmit" );if (skb ==NULL ) {
@@ -1492,10 +1494,8 @@ __lcs_start_xmit(struct lcs_card *card, card->stats.tx_carrier_errors++;return 0 ; } -if (netif_queue_stopped (dev) ) { - card->stats.tx_dropped++; -return -EBUSY ; - } +netif_stop_queue (card->dev); +spin_lock (&card->lock);if (card->tx_buffer !=NULL && card->tx_buffer->count +sizeof (struct lcs_header ) + skb->len +sizeof (u16) >LCS_IOBUFFERSIZE )
@@ -1506,7 +1506,8 @@ __lcs_start_xmit(struct lcs_card *card, card->tx_buffer =lcs_get_buffer (&card->write);if (card->tx_buffer ==NULL ) { card->stats.tx_dropped++; -return -EBUSY ; + rc = -EBUSY ; + goto out; } card->tx_buffer->callback = lcs_txbuffer_cb; card->tx_buffer->count =0 ;
@@ -1518,13 +1519,18 @@ __lcs_start_xmit(struct lcs_card *card, header->type = card->lan_type; header->slot = card->portno;memcpy (header +1 , skb->data, skb->len); +spin_unlock (&card->lock); card->stats.tx_bytes += skb->len; card->stats.tx_packets++;dev_kfree_skb (skb); -if (card->tx_emitted <=0 ) +netif_wake_queue (card->dev); +spin_lock (&card->lock); +if (card->tx_emitted <=0 && card->tx_buffer !=NULL )/* If this is the first tx buffer emit it immediately. */ __lcs_emit_txbuffer (card); -return 0 ; +out: +spin_unlock (&card->lock); +return rc; } static int
@@ -1535,9 +1541,7 @@ lcs_start_xmit(struct sk_buff *skb, struLCS_DBF_TEXT (5 , trace,"pktxmit" ); card = (struct lcs_card *) dev->priv; -spin_lock (&card->lock); rc =__lcs_start_xmit (card, skb, dev); -spin_unlock (&card->lock);return rc; }
@@ -2319,7 +2323,6 @@ __init lcs_init_module(void)PRINT_ERR ("Initialization failed\n" );return rc; } -return 0 ; }
drivers/s390/net/lcs.h +1 -1
@@ -95,7 +95,7 @@ do {*/ #define LCS_ILLEGAL_OFFSET 0xffff#define LCS_IOBUFFERSIZE 0x5000 -#define LCS_NUM_BUFFS 8/* needs to be power of 2 */ +#define LCS_NUM_BUFFS 32/* needs to be power of 2 */ #define LCS_MAC_LENGTH 6#define LCS_INVALID_PORT_NO -1#define LCS_LANCMD_TIMEOUT_DEFAULT 5
drivers/s390/net/qeth.h +47 -65
132 lines not on this page · raw message
drivers/s390/net/qeth_eddp.c +9 -2
@@ -59,8 +59,7 @@ qeth_eddp_free_context(struct qeth_eddp_for (i =0 ; i < ctx->num_pages; ++i)free_page ((unsigned long )ctx->pages[i]);kfree (ctx->pages); -if (ctx->elements !=NULL ) -kfree (ctx->elements); +kfree (ctx->elements);kfree (ctx); }
@@ -413,6 +412,13 @@ __qeth_eddp_fill_context_tcp(struct qethQETH_DBF_TEXT (trace,5 ,"eddpftcp" ); eddp->skb_offset =sizeof (struct qeth_hdr ) + eddp->nhl + eddp->thl; +if (eddp->qh.hdr.l2.id ==QETH_HEADER_TYPE_LAYER2 ) { + eddp->skb_offset +=sizeof (struct ethhdr ); +#ifdef CONFIG_QETH_VLAN +if (eddp->mac.h_proto ==__constant_htons (ETH_P_8021Q )) + eddp->skb_offset +=VLAN_HLEN ; +#endif /* CONFIG_QETH_VLAN */ + } tcph = eddp->skb->h.th;while (eddp->skb_offset < eddp->skb->len) { data_len = min((int)skb_shinfo(eddp->skb)->tso_size,
@@ -483,6 +489,7 @@ qeth_eddp_fill_context_tcp(struct qeth_ereturn -ENOMEM ; }if (qhdr->hdr.l2.id ==QETH_HEADER_TYPE_LAYER2 ) { + skb->mac.raw = (skb->data) +sizeof (struct qeth_hdr );memcpy (&eddp->mac,eth_hdr (skb),ETH_HLEN );#ifdef CONFIG_QETH_VLAN if (eddp->mac.h_proto ==__constant_htons (ETH_P_8021Q )) {
drivers/s390/net/qeth_main.c +7 -10
@@ -516,7 +516,8 @@ __qeth_set_offline(struct ccwgroup_devicQETH_DBF_TEXT (setup,3 ,"setoffl" );QETH_DBF_HEX (setup,3 , &card,sizeof (void *)); -netif_carrier_off (card->dev); +if (card->dev &&netif_carrier_ok (card->dev)) +netif_carrier_off (card->dev); recover_flag = card->state;if (qeth_stop_card (card, recovery_mode) == -ERESTARTSYS ){ PRINT_WARN("Stopping card %s interrupted by user!\n",
@@ -1679,6 +1680,7 @@ qeth_cmd_timeout(unsigned long data)spin_unlock_irqrestore (&reply->card->lock, flags); } +static struct qeth_ipa_cmd *qeth_check_ipa_data (struct qeth_card *card,struct qeth_cmd_buffer *iob) {
@@ -1699,7 +1701,8 @@ qeth_check_ipa_data(struct qeth_card *caQETH_CARD_IFNAME (card), card->info.chpid); card->lan_online =0 ; -netif_carrier_off (card->dev); +if (card->dev &&netif_carrier_ok (card->dev)) +netif_carrier_off (card->dev);return NULL ;case IPA_CMD_STARTLAN : PRINT_INFO("Link reestablished on %s "
@@ -5562,7 +5565,7 @@ qeth_set_multicast_list(struct net_devicif (card->info.type ==QETH_CARD_TYPE_OSN )return ; -QETH_DBF_TEXT (trace,3 ,"setmulti" ); +QETH_DBF_TEXT (trace,3 ,"setmulti" );qeth_delete_mc_addresses (card);if (card->options.layer2) {qeth_layer2_add_multicast (card);
@@ -5579,7 +5582,6 @@ out:return ;if (qeth_set_thread_start_bit (card,QETH_SET_PROMISC_MODE_THREAD )==0 )schedule_work (&card->kernel_thread_starter); - } static int
@@ -7452,6 +7454,7 @@ qeth_softsetup_card(struct qeth_card *ca card->lan_online =1 ;if (card->info.type==QETH_CARD_TYPE_OSN ) goto out; +qeth_set_large_send (card, card->options.large_send);if (card->options.layer2) { card->dev->features |= NETIF_F_HW_VLAN_FILTER |
@@ -7468,12 +7471,6 @@ qeth_softsetup_card(struct qeth_card *ca#endif goto out; } -if ((card->options.large_send ==QETH_LARGE_SEND_EDDP ) || - (card->options.large_send ==QETH_LARGE_SEND_TSO )) - card->dev->features |=NETIF_F_TSO |NETIF_F_SG ; -else - card->dev->features &= ~(NETIF_F_TSO |NETIF_F_SG ); -if ((rc =qeth_setadapter_parms (card)))QETH_DBF_TEXT_ (setup,2 ,"2err%d" , rc);if ((rc =qeth_start_ipassists (card)))