package/ep80579-drivers: refresh patches
SVN-Revision: 31801
This commit is contained in:
parent
1751186f18
commit
7217afc657
7 changed files with 35 additions and 39 deletions
|
@ -144,7 +144,7 @@
|
|||
/**
|
||||
* gcu_probe_err - gcu_probe error handler
|
||||
* @err: gcu_err_type
|
||||
@@ -295,7 +293,7 @@ gcu_notify_reboot(struct notifier_block
|
||||
@@ -295,7 +293,7 @@ gcu_notify_reboot(struct notifier_block
|
||||
case SYS_DOWN:
|
||||
case SYS_HALT:
|
||||
case SYS_POWER_OFF:
|
||||
|
@ -589,7 +589,7 @@
|
|||
|
||||
Contact Information:
|
||||
|
||||
@@ -2115,7 +2115,7 @@ iegbe_config_mac_to_phy(struct iegbe_hw
|
||||
@@ -2115,7 +2115,7 @@ iegbe_config_mac_to_phy(struct iegbe_hw
|
||||
|
||||
ret_val = iegbe_oem_set_trans_gasket(hw);
|
||||
if(ret_val){
|
||||
|
@ -598,7 +598,7 @@
|
|||
}
|
||||
ret_val = iegbe_oem_phy_is_full_duplex(
|
||||
hw, (int *) &is_FullDuplex);
|
||||
@@ -2164,7 +2164,7 @@ iegbe_config_mac_to_phy(struct iegbe_hw
|
||||
@@ -2164,7 +2164,7 @@ iegbe_config_mac_to_phy(struct iegbe_hw
|
||||
}
|
||||
/* Write the configured values back to the Device Control Reg. */
|
||||
E1000_WRITE_REG(hw, CTRL, ctrl);
|
||||
|
@ -911,7 +911,7 @@
|
|||
|
||||
/* iegbe_pci_tbl - PCI Device ID Table
|
||||
*
|
||||
@@ -148,95 +60,48 @@ char iegbe_copyright[] = "Copyright (c)
|
||||
@@ -148,95 +60,48 @@ char iegbe_copyright[] = "Copyright (c)
|
||||
* {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
|
||||
*/
|
||||
static struct pci_device_id iegbe_pci_tbl[] = {
|
||||
|
@ -3025,7 +3025,7 @@
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -1512,113 +1412,108 @@ iegbe_configure_tx(struct iegbe_adapter
|
||||
@@ -1512,113 +1412,108 @@ iegbe_configure_tx(struct iegbe_adapter
|
||||
|
||||
/* Setup the HW Tx Head and Tail descriptor pointers */
|
||||
|
||||
|
@ -3210,7 +3210,7 @@
|
|||
hw->bus_type == iegbe_bus_type_pcix) {
|
||||
adapter->pcix_82544 = 0x1;
|
||||
}
|
||||
@@ -1632,96 +1527,95 @@ iegbe_configure_tx(struct iegbe_adapter
|
||||
@@ -1632,96 +1527,95 @@ iegbe_configure_tx(struct iegbe_adapter
|
||||
* Returns 0 on success, negative on failure
|
||||
**/
|
||||
|
||||
|
@ -3830,7 +3830,7 @@
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -2022,20 +1859,19 @@ iegbe_configure_rx(struct iegbe_adapter
|
||||
@@ -2022,20 +1859,19 @@ iegbe_configure_rx(struct iegbe_adapter
|
||||
* Free all transmit software resources
|
||||
**/
|
||||
|
||||
|
@ -5848,7 +5848,7 @@
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -3232,13 +3212,12 @@ iegbe_tx_timeout_task(struct net_device
|
||||
@@ -3232,13 +3212,12 @@ iegbe_tx_timeout_task(struct net_device
|
||||
* The statistics are actually updated from the timer callback.
|
||||
**/
|
||||
|
||||
|
@ -6877,7 +6877,7 @@
|
|||
|
||||
/**
|
||||
* iegbe_rx_checksum - Receive Checksum Offload for 82543
|
||||
@@ -3913,192 +3689,193 @@ iegbe_clean_tx_irq(struct iegbe_adapter
|
||||
@@ -3913,192 +3689,193 @@ iegbe_clean_tx_irq(struct iegbe_adapter
|
||||
* @sk_buff: socket buffer with received data
|
||||
**/
|
||||
|
||||
|
@ -9333,7 +9333,7 @@
|
|||
iegbe_oem_phy_reset_dsp(struct iegbe_hw *hw)
|
||||
{
|
||||
#ifdef EXTERNAL_MDIO
|
||||
@@ -478,10 +413,8 @@ iegbe_oem_phy_reset_dsp(struct iegbe_hw
|
||||
@@ -478,10 +413,8 @@ iegbe_oem_phy_reset_dsp(struct iegbe_hw
|
||||
* no-op.
|
||||
*/
|
||||
switch (hw->phy_id) {
|
||||
|
@ -9346,7 +9346,7 @@
|
|||
DEBUGOUT("No DSP to reset on OEM PHY\n");
|
||||
break;
|
||||
default:
|
||||
@@ -508,7 +441,7 @@ iegbe_oem_phy_reset_dsp(struct iegbe_hw
|
||||
@@ -508,7 +441,7 @@ iegbe_oem_phy_reset_dsp(struct iegbe_hw
|
||||
* This is called from iegbe_phy_force_speed_duplex, which is
|
||||
* called from iegbe_oem_setup_link.
|
||||
**/
|
||||
|
@ -9623,7 +9623,7 @@
|
|||
iegbe_oem_phy_is_copper(struct iegbe_hw *hw)
|
||||
{
|
||||
#ifdef EXTERNAL_MDIO
|
||||
@@ -827,23 +738,21 @@ iegbe_oem_phy_is_copper(struct iegbe_hw
|
||||
@@ -827,23 +738,21 @@ iegbe_oem_phy_is_copper(struct iegbe_hw
|
||||
switch (hw->phy_id) {
|
||||
case M88E1000_I_PHY_ID:
|
||||
case M88E1141_E_PHY_ID:
|
||||
|
@ -9650,7 +9650,7 @@
|
|||
*/
|
||||
DEBUGOUT("Invalid value for transceiver type, return FALSE\n");
|
||||
return FALSE;
|
||||
@@ -856,19 +765,19 @@ iegbe_oem_phy_is_copper(struct iegbe_hw
|
||||
@@ -856,19 +765,19 @@ iegbe_oem_phy_is_copper(struct iegbe_hw
|
||||
* iegbe_oem_get_phy_dev_number
|
||||
* @hw: iegbe_hw struct containing device specific information
|
||||
*
|
||||
|
@ -10804,7 +10804,7 @@
|
|||
uint32_t data_length);
|
||||
int iegbe_oem_phy_loopback(struct iegbe_adapter *adapter);
|
||||
void iegbe_oem_loopback_cleanup(struct iegbe_adapter *adapter);
|
||||
@@ -94,81 +94,14 @@ int32_t iegbe_oem_phy_is_link_up(struct
|
||||
@@ -94,81 +94,14 @@ int32_t iegbe_oem_phy_is_link_up(struct
|
||||
#define ICP_XXXX_MAC_2 2
|
||||
|
||||
#define DEFAULT_ICP_XXXX_TIPG_IPGT 8 /* Inter Packet Gap Transmit Time */
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
/**
|
||||
* iegbe_probe - Device Initialization Routine
|
||||
* @pdev: PCI device information struct
|
||||
@@ -800,24 +820,11 @@ static int __devinit iegbe_probe(struct
|
||||
@@ -800,24 +820,11 @@ static int __devinit iegbe_probe(struct
|
||||
if (!hw->hw_addr)
|
||||
goto err_ioremap;
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
int num_rx_queues;
|
||||
--- a/Embedded/src/GbE/iegbe_main.c
|
||||
+++ b/Embedded/src/GbE/iegbe_main.c
|
||||
@@ -763,7 +763,7 @@ static int __devinit iegbe_probe(struct
|
||||
@@ -763,7 +763,7 @@ static int __devinit iegbe_probe(struct
|
||||
struct iegbe_hw *hw;
|
||||
|
||||
static int cards_found = 0;
|
||||
|
@ -85,7 +85,7 @@
|
|||
**/
|
||||
|
||||
static int __devinit
|
||||
@@ -1158,15 +1143,6 @@ iegbe_alloc_queues(struct iegbe_adapter
|
||||
@@ -1158,15 +1143,6 @@ iegbe_alloc_queues(struct iegbe_adapter
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Embedded/src/GbE/iegbe_main.c
|
||||
+++ b/Embedded/src/GbE/iegbe_main.c
|
||||
@@ -775,13 +775,13 @@ static int __devinit iegbe_probe(struct
|
||||
@@ -775,13 +775,13 @@ static int __devinit iegbe_probe(struct
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
case M88E1000_I_PHY_ID:
|
||||
case M88E1141_E_PHY_ID:
|
||||
ret_val = iegbe_oem_read_phy_reg_ex(hw,
|
||||
@@ -415,6 +479,8 @@ iegbe_oem_phy_reset_dsp(struct iegbe_hw
|
||||
@@ -415,6 +479,8 @@ iegbe_oem_phy_reset_dsp(struct iegbe_hw
|
||||
switch (hw->phy_id) {
|
||||
case M88E1000_I_PHY_ID:
|
||||
case M88E1141_E_PHY_ID:
|
||||
|
@ -161,7 +161,7 @@
|
|||
phy_num = DEFAULT_ICP_XXXX_TIPG_IPGT;
|
||||
break;
|
||||
default:
|
||||
@@ -738,6 +829,8 @@ iegbe_oem_phy_is_copper(struct iegbe_hw
|
||||
@@ -738,6 +829,8 @@ iegbe_oem_phy_is_copper(struct iegbe_hw
|
||||
switch (hw->phy_id) {
|
||||
case M88E1000_I_PHY_ID:
|
||||
case M88E1141_E_PHY_ID:
|
||||
|
@ -670,7 +670,7 @@
|
|||
+}
|
||||
--- a/Embedded/src/GbE/iegbe_oem_phy.h
|
||||
+++ b/Embedded/src/GbE/iegbe_oem_phy.h
|
||||
@@ -95,6 +95,8 @@ int32_t iegbe_oem_phy_is_link_up(struct
|
||||
@@ -95,6 +95,8 @@ int32_t iegbe_oem_phy_is_link_up(struct
|
||||
|
||||
#define DEFAULT_ICP_XXXX_TIPG_IPGT 8 /* Inter Packet Gap Transmit Time */
|
||||
#define ICP_XXXX_TIPG_IPGT_MASK 0x000003FFUL
|
||||
|
@ -679,7 +679,7 @@
|
|||
|
||||
/* Miscellaneous defines */
|
||||
#ifdef IEGBE_10_100_ONLY
|
||||
@@ -103,5 +105,65 @@ int32_t iegbe_oem_phy_is_link_up(struct
|
||||
@@ -103,5 +105,65 @@ int32_t iegbe_oem_phy_is_link_up(struct
|
||||
#define ICP_XXXX_AUTONEG_ADV_DEFAULT 0x2F
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
||||
--- a/Embedded/src/CAN/can_main.c 2009-11-30 10:44:39.044269751 +0100
|
||||
+++ b/Embedded/src/CAN/can_main.c 2009-11-30 10:54:41.434355642 +0100
|
||||
@@ -213,8 +213,8 @@
|
||||
--- a/Embedded/src/CAN/can_main.c
|
||||
+++ b/Embedded/src/CAN/can_main.c
|
||||
@@ -214,8 +214,8 @@ int can_pci_probe(struct pci_dev *dev, c
|
||||
spin_lock_init(&(g_can_os[can_num].int_spinlock));
|
||||
spin_lock_init(&(g_can_os[can_num].open_spinlock));
|
||||
|
||||
|
@ -12,7 +11,7 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
|||
{
|
||||
printk("Couldn't create CAN device %d. Exiting.\n",
|
||||
dev->device);
|
||||
@@ -236,7 +236,7 @@
|
||||
@@ -237,7 +237,7 @@ int can_pci_probe(struct pci_dev *dev, c
|
||||
*****************************************************************************/
|
||||
void can_pci_remove(struct pci_dev *dev)
|
||||
{
|
||||
|
@ -21,7 +20,7 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
|||
|
||||
iounmap(can_os->pci_remap);
|
||||
icp_can_destroy(can_os->can);
|
||||
@@ -250,7 +250,7 @@
|
||||
@@ -251,7 +251,7 @@ int can_pci_suspend(struct pci_dev *dev,
|
||||
{
|
||||
unsigned int i;
|
||||
unsigned int int_status;
|
||||
|
@ -30,7 +29,7 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
|||
int err;
|
||||
|
||||
/* Indicate that we are suspending */
|
||||
@@ -321,7 +321,7 @@
|
||||
@@ -322,7 +322,7 @@ int can_pci_suspend(struct pci_dev *dev,
|
||||
int can_pci_resume(struct pci_dev *dev)
|
||||
{
|
||||
unsigned int i;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
diff -Nur a/Embedded/src/1588/1588.c b/Embedded/src/1588/1588.c
|
||||
--- a/Embedded/src/1588/1588.c 2009-11-10 14:20:46.563322192 +0100
|
||||
+++ b/Embedded/src/1588/1588.c 2009-11-30 10:44:22.144270452 +0100
|
||||
--- a/Embedded/src/1588/1588.c
|
||||
+++ b/Embedded/src/1588/1588.c
|
||||
@@ -72,6 +72,7 @@
|
||||
*
|
||||
****************************************************************************/
|
||||
|
@ -9,9 +8,8 @@ diff -Nur a/Embedded/src/1588/1588.c b/Embedded/src/1588/1588.c
|
|||
#include "1588.h"
|
||||
|
||||
MODULE_AUTHOR("Intel(R) Corporation");
|
||||
diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
||||
--- a/Embedded/src/CAN/can_main.c 2009-11-10 14:20:46.563322192 +0100
|
||||
+++ b/Embedded/src/CAN/can_main.c 2009-11-30 10:44:39.044269751 +0100
|
||||
--- a/Embedded/src/CAN/can_main.c
|
||||
+++ b/Embedded/src/CAN/can_main.c
|
||||
@@ -68,6 +68,7 @@
|
||||
*
|
||||
**************************************************************************/
|
||||
|
@ -19,10 +17,9 @@ diff -Nur a/Embedded/src/CAN/can_main.c b/Embedded/src/CAN/can_main.c
|
|||
+#include <linux/sched.h>
|
||||
#include "can_main.h"
|
||||
#include "can_ioctl.h"
|
||||
|
||||
diff -Nur a/Embedded/src/WDT/iwdt.c b/Embedded/src/WDT/iwdt.c
|
||||
--- a/Embedded/src/WDT/iwdt.c 2009-11-10 14:20:46.563322192 +0100
|
||||
+++ b/Embedded/src/WDT/iwdt.c 2009-11-30 10:44:54.024262744 +0100
|
||||
#include <linux/fs.h>
|
||||
--- a/Embedded/src/WDT/iwdt.c
|
||||
+++ b/Embedded/src/WDT/iwdt.c
|
||||
@@ -137,6 +137,7 @@
|
||||
#include <linux/watchdog.h>
|
||||
#include <linux/miscdevice.h>
|
||||
|
|
Loading…
Reference in a new issue