ixgb: driver update to 1.0.104-k2
Subsystems (2)
cover ixgb: driver update to 1.0.104-k2
Hi,
This is a resend/updated set of patches for ixgb. They were originally sent earlier on 2005-04-21 by Jeff Kirsher. Some modifications were made after comments, and this series does not include 2 of the patches sent at that time (I will resend those modified later).
Summary:
[1] fix rare early tso completion
[2] remove duplicate code setting duplex and speed
[3] fix flow control
[4] add NETIF_F_LLTX analogous to e1000
[5] add copper 10gig driver id
[6] remove hardcoded number
[7] use DPRINTK and msglvl, and ethtool to control it
[8] add tx timeout counter
[9] increment version to 1.0.104-k2
These changes are available through git.
git pull git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ixgb-1.0.104-k2
these patches are against
netdev-2.6#upstream 4e3ceac609cce39cb96e0eb8604934592371ed8c
Cheers,
Auke
--- drivers/net/ixgb/ixgb.h | 9 ++- drivers/net/ixgb/ixgb_ethtool.c | 55 ++++++++++------ drivers/net/ixgb/ixgb_hw.h | 1 drivers/net/ixgb/ixgb_ids.h | 4 + drivers/net/ixgb/ixgb_main.c | 132 ++++++++++++++++++++++++++++++++------- drivers/net/ixgb/ixgb_param.c | 24 +++---- 6 files changed, 163 insertions(+), 62 deletions(-)
--
Auke Kok <[email protected]>
PATCH 1/9 ixgb: fix rare early tso completion
Fix rare early completion when using TSO. This essentially is the e1000 fix, with code that was mostly already written. Another skb frag was also needed.
---
drivers/net/ixgb/ixgb_main.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-)
drivers/net/ixgb/ixgb_main.c +15 -2
@@ -1266,6 +1266,7 @@ ixgb_tx_map(struct ixgb_adapter *adapterstruct ixgb_buffer *buffer_info;int len = skb->len;unsigned int offset =0 , size, count =0 , i; +unsigned int mss =skb_shinfo (skb)->tso_size;unsigned int nr_frags =skb_shinfo (skb)->nr_frags;unsigned int f;
@@ -1277,6 +1278,11 @@ ixgb_tx_map(struct ixgb_adapter *adapterwhile (len) { buffer_info = &tx_ring->buffer_info[i]; size =min (len,IXGB_MAX_JUMBO_FRAME_SIZE ); +/* Workaround for premature desc write-backs +* in TSO mode. Append 4-byte sentinel desc */ +if (unlikely (mss && !nr_frags && size == len && size >8 )) + size -=4 ; + buffer_info->length = size; buffer_info->dma = pci_map_single(adapter->pdev,
@@ -1301,6 +1307,12 @@ ixgb_tx_map(struct ixgb_adapter *adapterwhile (len) { buffer_info = &tx_ring->buffer_info[i]; size =min (len,IXGB_MAX_JUMBO_FRAME_SIZE ); +/* Workaround for premature desc write-backs +* in TSO mode. Append 4-byte sentinel desc */ +if (unlikely (mss && (f == (nr_frags-1 )) && (size == len) + && (size >8 ))) + size -=4 ; + buffer_info->length = size; buffer_info->dma = pci_map_page(adapter->pdev,
@@ -1378,7 +1390,8 @@ ixgb_tx_queue(struct ixgb_adapter *adapt#define TXD_USE_COUNT (S ) (((S) >> IXGB_MAX_TXD_PWR) + \ (((S) & (IXGB_MAX_DATA_PER_TXD - 1)) ? 1 : 0))#define DESC_NEEDED TXD_USE_COUNT(IXGB_MAX_DATA_PER_TXD) + \ - MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1 + MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1 \ + /* one more for TSO workaround */ + 1static int ixgb_xmit_frame (struct sk_buff *skb,struct net_device *netdev)
@@ -1416,7 +1429,7 @@ ixgb_xmit_frame(struct sk_buff *skb, strreturn NETDEV_TX_OK ; } -if (tso) +if (likely (tso)) tx_flags |=IXGB_TX_FLAGS_TSO ;else if (ixgb_tx_csum (adapter, skb)) tx_flags |=IXGB_TX_FLAGS_CSUM ;
--
Auke Kok <[email protected]>
PATCH 2/9 ixgb: remove duplicate code setting duplex and speed
In reply to Kok, AukeRemoved duplicate code. Create ixgb_set_speed_duplex function to contain duplicate code.
---
drivers/net/ixgb/ixgb_ethtool.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-)
drivers/net/ixgb/ixgb_ethtool.c +14 -21
@@ -117,6 +117,16 @@ ixgb_get_settings(struct net_device *netreturn 0 ; } +static void ixgb_set_speed_duplex (struct net_device *netdev) +{ +struct ixgb_adapter *adapter =netdev_priv (netdev); +/* be optimistic about our link, since we were up before */ + adapter->link_speed =10000 ; + adapter->link_duplex =FULL_DUPLEX ; +netif_carrier_on (netdev); +netif_wake_queue (netdev); +} +static int ixgb_set_settings (struct net_device *netdev,struct ethtool_cmd *ecmd) {
@@ -130,12 +140,7 @@ ixgb_set_settings(struct net_device *netixgb_down (adapter, TRUE);ixgb_reset (adapter);ixgb_up (adapter); -/* be optimistic about our link, since we were up before */ - adapter->link_speed =10000 ; - adapter->link_duplex =FULL_DUPLEX ; -netif_carrier_on (netdev); -netif_wake_queue (netdev); - +ixgb_set_speed_duplex (netdev); }else ixgb_reset (adapter);
@@ -183,11 +188,7 @@ ixgb_set_pauseparam(struct net_device *nif (netif_running (adapter->netdev)) {ixgb_down (adapter, TRUE);ixgb_up (adapter); -/* be optimistic about our link, since we were up before */ - adapter->link_speed =10000 ; - adapter->link_duplex =FULL_DUPLEX ; -netif_carrier_on (netdev); -netif_wake_queue (netdev); +ixgb_set_speed_duplex (netdev); }else ixgb_reset (adapter);
@@ -212,11 +213,7 @@ ixgb_set_rx_csum(struct net_device *netdif (netif_running (netdev)) {ixgb_down (adapter,TRUE);ixgb_up (adapter); -/* be optimistic about our link, since we were up before */ - adapter->link_speed =10000 ; - adapter->link_duplex =FULL_DUPLEX ; -netif_carrier_on (netdev); -netif_wake_queue (netdev); +ixgb_set_speed_duplex (netdev); }else ixgb_reset (adapter);return 0 ;
@@ -593,11 +590,7 @@ ixgb_set_ringparam(struct net_device *ne adapter->tx_ring = tx_new;if ((err =ixgb_up (adapter)))return err; -/* be optimistic about our link, since we were up before */ - adapter->link_speed =10000 ; - adapter->link_duplex =FULL_DUPLEX ; -netif_carrier_on (netdev); -netif_wake_queue (netdev); +ixgb_set_speed_duplex (netdev); }return 0 ;
--
Auke Kok <[email protected]>
PATCH 3/9 ixgb: fix flow control
In reply to Kok, AukeMake default flow control only have *sending* of flow control packets enabled, and fix to disable / enable flow control correctly. Set flow control defaults to disable receiving flow control from the link partner, to fix the transmit fifo overlow errata
---
drivers/net/ixgb/ixgb_param.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-)
drivers/net/ixgb/ixgb_param.c +11 -13
@@ -76,7 +76,7 @@ IXGB_PARAM(RxDescriptors, "Number of rec* - 2 - Tx only, generate PAUSE frames but ignore them on receive * - 3 - Full Flow Control Support * -* Default Value: Read flow control settings from the EEPROM +* Default Value: 2 - Tx only (silicon bug avoidance) */ IXGB_PARAM (FlowControl,"Flow Control setting" );
@@ -137,7 +137,7 @@ IXGB_PARAM(RxFCLowThresh, "Receive Flow* * Valid Range: 1 - 65535 * -* Default Value: 256 (0x100) +* Default Value: 65535 (0xffff) (we'll send an xon if we recover) */ IXGB_PARAM (FCReqTimeout,"Flow Control Request Timeout" );
@@ -165,8 +165,6 @@ IXGB_PARAM(IntDelayEnable, "Transmit Int#define XSUMRX_DEFAULT OPTION_ENABLED -#define FLOW_CONTROL_FULL ixgb_fc_full -#define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL#define DEFAULT_FCRTL 0x28000#define DEFAULT_FCRTH 0x30000#define MIN_FCRTL 0
@@ -174,9 +172,9 @@ IXGB_PARAM(IntDelayEnable, "Transmit Int#define MIN_FCRTH 8#define MAX_FCRTH 0x3FFF0 -#define DEFAULT_FCPAUSE 0x100/* this may be too long */ #define MIN_FCPAUSE 1#define MAX_FCPAUSE 0xffff +#define DEFAULT_FCPAUSE 0xFFFF/* this may be too long */ struct ixgb_option {enum { enable_option, range_option, list_option } type;
@@ -336,7 +334,7 @@ ixgb_check_options(struct ixgb_adapter * .type = list_option, .name = "Flow Control", .err = "reading default settings from EEPROM", - .def = ixgb_fc_full, + .def = ixgb_fc_tx_pause, .arg = { .l = { .nr = LIST_LEN(fc_list), .p = fc_list }} };
@@ -365,8 +363,8 @@ ixgb_check_options(struct ixgb_adapter * }else { adapter->hw.fc.high_water = opt.def; } -if (!(adapter->hw.fc.type & ixgb_fc_rx_pause) ) -printk (KERN_INFO +if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) +printk (KERN_INFO "Ignoring RxFCHighThresh when no RxFC\n" ); } {/* Receive Flow Control Low Threshold */
@@ -385,8 +383,8 @@ ixgb_check_options(struct ixgb_adapter * }else { adapter->hw.fc.low_water = opt.def; } -if (!(adapter->hw.fc.type & ixgb_fc_rx_pause) ) -printk (KERN_INFO +if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) +printk (KERN_INFO "Ignoring RxFCLowThresh when no RxFC\n" ); } {/* Flow Control Pause Time Request*/
@@ -406,12 +404,12 @@ ixgb_check_options(struct ixgb_adapter * }else { adapter->hw.fc.pause_time = opt.def; } -if (!(adapter->hw.fc.type & ixgb_fc_rx_pause) ) -printk (KERN_INFO +if (!(adapter->hw.fc.type & ixgb_fc_tx_pause) ) +printk (KERN_INFO "Ignoring FCReqTimeout when no RxFC\n" ); }/* high low and spacing check for rx flow control thresholds */ -if (adapter->hw.fc.type & ixgb_fc_rx_pause) { +if (adapter->hw.fc.type & ixgb_fc_tx_pause) {/* high must be greater than low */ if (adapter->hw.fc.high_water < (adapter->hw.fc.low_water +8 )) {/* set defaults */
--
Auke Kok <[email protected]>
PATCH 4/9 ixgb: add NETIF_F_LLTX analogous to e1000
In reply to Kok, Aukeadd NETIF_F_LLTX code like e1000 has
---
drivers/net/ixgb/ixgb_main.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-)
drivers/net/ixgb/ixgb_main.c +29 -2
@@ -449,6 +449,9 @@ ixgb_probe(struct pci_dev *pdev,#ifdef NETIF_F_TSO netdev->features |=NETIF_F_TSO ;#endif +#ifdef NETIF_F_LLTX + netdev->features |=NETIF_F_LLTX ; +#endif if (pci_using_dac) netdev->features |=NETIF_F_HIGHDMA ;
@@ -1408,13 +1411,26 @@ ixgb_xmit_frame(struct sk_buff *skb, strreturn 0 ; } +#ifdef NETIF_F_LLTX +local_irq_save (flags); +if (!spin_trylock (&adapter->tx_lock)) { +/* Collision - tell upper layer to requeue */ +local_irq_restore (flags); +return NETDEV_TX_LOCKED ; + } +#else spin_lock_irqsave (&adapter->tx_lock, flags); +#endif +if (unlikely (IXGB_DESC_UNUSED (&adapter->tx_ring) <DESC_NEEDED )) {netif_stop_queue (netdev);spin_unlock_irqrestore (&adapter->tx_lock, flags); -return 1 ; +return NETDEV_TX_BUSY ; } + +#ifndef NETIF_F_LLTX spin_unlock_irqrestore (&adapter->tx_lock, flags); +#endif if (adapter->vlgrp &&vlan_tx_tag_present (skb)) { tx_flags |=IXGB_TX_FLAGS_VLAN ;
@@ -1426,6 +1442,9 @@ ixgb_xmit_frame(struct sk_buff *skb, str tso =ixgb_tso (adapter, skb);if (tso <0 ) {dev_kfree_skb_any (skb); +#ifdef NETIF_F_LLTX +spin_unlock_irqrestore (&adapter->tx_lock, flags); +#endif return NETDEV_TX_OK ; }
@@ -1439,7 +1458,15 @@ ixgb_xmit_frame(struct sk_buff *skb, str netdev->trans_start = jiffies; -return 0 ; +#ifdef NETIF_F_LLTX +/* Make sure there is space in the ring for the next send. */ +if (unlikely (IXGB_DESC_UNUSED (&adapter->tx_ring) <DESC_NEEDED )) +netif_stop_queue (netdev); + +spin_unlock_irqrestore (&adapter->tx_lock, flags); + +#endif +return NETDEV_TX_OK ; }/**
--
Auke Kok <[email protected]>
PATCH 5/9 ixgb: add copper 10gig driver id
In reply to Kok, AukeAdd support for Copper 10GbE device ID 109E
---
drivers/net/ixgb/ixgb_hw.h | 1 + drivers/net/ixgb/ixgb_ids.h | 4 +++- drivers/net/ixgb/ixgb_main.c | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/ixgb/ixgb_hw.h +1 -0
@@ -57,6 +57,7 @@ typedef enum {typedef enum { ixgb_media_type_unknown =0 , ixgb_media_type_fiber =1 , + ixgb_media_type_copper =2 , ixgb_num_media_types }ixgb_media_type ;
drivers/net/ixgb/ixgb_ids.h +3 -1
@@ -43,6 +43,8 @@#define IXGB_SUBDEVICE_ID_A11F 0xA11F#define IXGB_SUBDEVICE_ID_A01F 0xA01F -#endif /* #ifndef _IXGB_IDS_H_ */ +#define IXGB_DEVICE_ID_82597EX_CX4 0x109E +#define IXGB_SUBDEVICE_ID_A00C 0xA00C +#endif /* #ifndef _IXGB_IDS_H_ */ /* End of File */
drivers/net/ixgb/ixgb_main.c +5 -2
@@ -67,6 +67,8 @@ static char ixgb_copyright[] = "Copyrighstatic struct pci_device_id ixgb_pci_tbl[] = { {INTEL_VENDOR_ID ,IXGB_DEVICE_ID_82597EX ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {INTEL_VENDOR_ID ,IXGB_DEVICE_ID_82597EX_CX4 , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {INTEL_VENDOR_ID ,IXGB_DEVICE_ID_82597EX_SR ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {INTEL_VENDOR_ID ,IXGB_DEVICE_ID_82597EX_LR ,
@@ -565,8 +567,9 @@ ixgb_sw_init(struct ixgb_adapter *adapte hw->max_frame_size = netdev->mtu +ENET_HEADER_SIZE +ENET_FCS_LENGTH ;if ((hw->device_id ==IXGB_DEVICE_ID_82597EX ) - ||(hw->device_id ==IXGB_DEVICE_ID_82597EX_LR ) - ||(hw->device_id ==IXGB_DEVICE_ID_82597EX_SR )) + || (hw->device_id ==IXGB_DEVICE_ID_82597EX_CX4 ) + || (hw->device_id ==IXGB_DEVICE_ID_82597EX_LR ) + || (hw->device_id ==IXGB_DEVICE_ID_82597EX_SR )) hw->mac_type = ixgb_82597;else {/* should never have loaded on this device */
--
Auke Kok <[email protected]>
PATCH 6/9 ixgb: remove hardcoded number
In reply to Kok, AukeThis adds a define for an awkward and uncommented value.
---
drivers/net/ixgb/ixgb_ethtool.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/net/ixgb/ixgb_ethtool.c +3 -1
@@ -44,6 +44,8 @@ extern void ixgb_free_rx_resources(strucextern void ixgb_free_tx_resources (struct ixgb_adapter *adapter);extern void ixgb_update_stats (struct ixgb_adapter *adapter); +#define IXGB_ALL_RAR_ENTRIES 16 +struct ixgb_stats {char stat_string[ETH_GSTRING_LEN ];int sizeof_stat;
@@ -300,7 +302,7 @@ ixgb_get_regs(struct net_device *netdev, *reg++ =IXGB_READ_REG (hw,RXCSUM );/* 20 */ /* there are 16 RAR entries in hardware, we only use 3 */ -for (i =0 ; i <16 ; i++) { +for (i =0 ; i <IXGB_ALL_RAR_ENTRIES ; i++) { *reg++ =IXGB_READ_REG_ARRAY (hw,RAL , (i <<1 ));/*21,...,51 */ *reg++ =IXGB_READ_REG_ARRAY (hw,RAH , (i <<1 ));/*22,...,52 */ }
--
Auke Kok <[email protected]>
PATCH 7/9 ixgb: use DPRINTK and msglvl, and ethtool to control it
In reply to Kok, AukeUse DPRINTK and msglvl, and ethtool to control it. Add proper names to netdev structs and mappings.
---
drivers/net/ixgb/ixgb.h | 8 ++++++- drivers/net/ixgb/ixgb_ethtool.c | 15 +++++++++++++ drivers/net/ixgb/ixgb_main.c | 46 +++++++++++++++++++++++++++------------ 3 files changed, 54 insertions(+), 15 deletions(-)
drivers/net/ixgb/ixgb.h +7 -1
@@ -84,7 +84,12 @@ struct ixgb_adapter; #define IXGB_DBG(args...)#endif -#define IXGB_ERR(args...) printk(KERN_ERR "ixgb: " args) +#define PFX "ixgb: " +#define DPRINTK(nlevel, klevel, fmt, args...) \ + (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ + printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ + __FUNCTION__ , ## args)) +/* TX/RX descriptor defines */ #define DEFAULT_TXD 256
@@ -192,6 +197,7 @@ struct ixgb_adapter {/* structs defined in ixgb_hw.h */ struct ixgb_hw hw; +u16 msg_enable;struct ixgb_hw_stats stats;#ifdef CONFIG_PCI_MSI boolean_t have_msi;
drivers/net/ixgb/ixgb_ethtool.c +15 -0
@@ -250,6 +250,19 @@ ixgb_set_tso(struct net_device *netdev, }#endif /* NETIF_F_TSO */ +static uint32_t +ixgb_get_msglevel (struct net_device *netdev) +{ +struct ixgb_adapter *adapter = netdev->priv; +return adapter->msg_enable; +} + +static void +ixgb_set_msglevel (struct net_device *netdev,uint32_t data) +{ +struct ixgb_adapter *adapter = netdev->priv; + adapter->msg_enable = data; +}#define IXGB_GET_STAT (_A_, _R_) _A_->stats._R_ static int
@@ -709,6 +722,8 @@ static struct ethtool_ops ixgb_ethtool_o .set_tx_csum = ixgb_set_tx_csum, .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, + .get_msglevel = ixgb_get_msglevel, + .set_msglevel = ixgb_set_msglevel, #ifdef NETIF_F_TSO .get_tso = ethtool_op_get_tso, .set_tso = ixgb_set_tso,
drivers/net/ixgb/ixgb_main.c +32 -14
161 lines not on this page · raw message
--
Auke Kok <[email protected]>
PATCH 8/9 ixgb: add tx timeout counter
In reply to Kok, AukeThis adds a TX timeout counter to the ethtool stats, a tx timeout debug message, and sets the timer to 5 seconds.
---
drivers/net/ixgb/ixgb.h | 1 + drivers/net/ixgb/ixgb_ethtool.c | 1 + drivers/net/ixgb/ixgb_main.c | 29 +++++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-)
drivers/net/ixgb/ixgb.h +1 -0
@@ -180,6 +180,7 @@ struct ixgb_adapter {uint64_t hw_csum_tx_good;uint64_t hw_csum_tx_error;uint32_t tx_int_delay; +uint32_t tx_timeout_count;boolean_t tx_int_delay_enable;boolean_t detect_tx_hung;
drivers/net/ixgb/ixgb_ethtool.c +1 -0
@@ -78,6 +78,7 @@ static struct ixgb_stats ixgb_gstrings_s {"tx_heartbeat_errors", IXGB_STAT(net_stats.tx_heartbeat_errors)}, {"tx_window_errors", IXGB_STAT(net_stats.tx_window_errors)}, {"tx_deferred_ok", IXGB_STAT(stats.dc)}, + {"tx_timeout_count", IXGB_STAT(tx_timeout_count) }, {"rx_long_length_errors", IXGB_STAT(stats.roc)}, {"rx_short_length_errors", IXGB_STAT(stats.ruc)}, #ifdef NETIF_F_TSO
drivers/net/ixgb/ixgb_main.c +25 -4
@@ -428,7 +428,7 @@ ixgb_probe(struct pci_dev *pdev, netdev->change_mtu = &ixgb_change_mtu;ixgb_set_ethtool_ops (netdev); netdev->tx_timeout = &ixgb_tx_timeout; - netdev->watchdog_timeo =HZ ; + netdev->watchdog_timeo =5 *HZ ;#ifdef CONFIG_IXGB_NAPI netdev->poll = &ixgb_clean; netdev->weight =64 ;
@@ -1509,6 +1509,7 @@ ixgb_tx_timeout_task(struct net_device * {struct ixgb_adapter *adapter =netdev_priv (netdev); + adapter->tx_timeout_count++;ixgb_down (adapter, TRUE);ixgb_up (adapter); }
@@ -1838,11 +1839,31 @@ ixgb_clean_tx_irq(struct ixgb_adapter *a/* detect a transmit hang in hardware, this serializes the * check with the clearing of time_stamp and movement of i */ adapter->detect_tx_hung = FALSE; -if (tx_ring->buffer_info[i].dma && -time_after (jiffies, tx_ring->buffer_info[i].time_stamp +HZ ) +if (tx_ring->buffer_info[eop].dma && +time_after (jiffies, tx_ring->buffer_info[eop].time_stamp +HZ ) && !(IXGB_READ_REG (&adapter->hw,STATUS ) & -IXGB_STATUS_TXOFF )) +IXGB_STATUS_TXOFF )) { +/* detected Tx unit hang */ +DPRINTK (DRV ,ERR ,"Detected Tx Unit Hang\n" +" TDH <%x>\n" +" TDT <%x>\n" +" next_to_use <%x>\n" +" next_to_clean <%x>\n" +"buffer_info[next_to_clean]\n" +" time_stamp <%lx>\n" +" next_to_watch <%x>\n" +" jiffies <%lx>\n" +" next_to_watch.status <%x>\n" , +IXGB_READ_REG (&adapter->hw,TDH ), +IXGB_READ_REG (&adapter->hw,TDT ), + tx_ring->next_to_use, + tx_ring->next_to_clean, + tx_ring->buffer_info[eop].time_stamp, + eop, + jiffies, + eop_desc->status);netif_stop_queue (netdev); + } }return cleaned;
--
Auke Kok <[email protected]>
PATCH 9/9 ixgb: increment version to 1.0.104-k2
In reply to Kok, AukeIncrement the driver version to 1.0.104-k2
---
drivers/net/ixgb/ixgb_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ixgb/ixgb_main.c +1 -1
@@ -52,7 +52,7 @@ static char ixgb_driver_string[] = "Inte#else #define DRIVERNAPI "-NAPI"#endif -#define DRV_VERSION "1.0.100-k2"DRIVERNAPI +#define DRV_VERSION "1.0.104-k2"DRIVERNAPIchar ixgb_driver_version[] =DRV_VERSION ;static char ixgb_copyright[] ="Copyright (c) 1999-2005 Intel Corporation." ;
--
Auke Kok <[email protected]>
Quoted 20 lines · Auke
Hi,
This is a resend/updated set of patches for ixgb. They were originally sent earlier on 2005-04-21 by Jeff Kirsher. Some modifications were made after comments, and this series does not include 2 of the patches sent at that time (I will resend those modified later).
Summary:
[1] fix rare early tso completion
[2] remove duplicate code setting duplex and speed
[3] fix flow control
[4] addNETIF_F_LLTXanalogous to e1000
[5] add copper 10gig driver id
[6] remove hardcoded number
[7] use DPRINTK and msglvl, and ethtool to control it
[8] add tx timeout counter
[9] increment version to 1.0.104-k2
Quoted 6 lines
These changes are available through git.
git pull
git://lost.foo-projects.org/~ahkok/git/netdev-2.6ixgb-1.0.104-k2these patches are against
netdev-2.6#upstream4e3ceac609cce39cb96e0eb8604934592371ed8c
pulled, thanks