diff options
Diffstat (limited to 'openvz-sources/022.078-r3/5132_diff-drv-sky2-backport-20060714.patch')
| -rw-r--r-- | openvz-sources/022.078-r3/5132_diff-drv-sky2-backport-20060714.patch | 150 |
1 files changed, 0 insertions, 150 deletions
diff --git a/openvz-sources/022.078-r3/5132_diff-drv-sky2-backport-20060714.patch b/openvz-sources/022.078-r3/5132_diff-drv-sky2-backport-20060714.patch deleted file mode 100644 index 2ea4ee2..0000000 --- a/openvz-sources/022.078-r3/5132_diff-drv-sky2-backport-20060714.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -Nurap 78.9.sky2.1/drivers/net/sky2.c 78.9.a/drivers/net/sky2.c ---- 78.9.sky2.1/drivers/net/sky2.c 2006-07-14 17:38:50.000000000 +0400 -+++ 78.9.a/drivers/net/sky2.c 2006-07-14 17:45:35.000000000 +0400 -@@ -47,6 +47,7 @@ - #define SKY2_VLAN_TAG_USED 1 - #endif - -+#include "sky2_compat.h" - #include "sky2.h" - - #define DRV_NAME "sky2" -@@ -1161,7 +1162,7 @@ static unsigned tx_le_req(const struct s - count = sizeof(dma_addr_t) / sizeof(u32); - count += skb_shinfo(skb)->nr_frags * count; - -- if (skb_is_gso(skb)) -+ if (skb_is_tso(skb)) - ++count; - - if (skb->ip_summed == CHECKSUM_HW) -@@ -1233,7 +1234,7 @@ static int sky2_xmit_frame(struct sk_buf - } - - /* Check for TCP Segmentation Offload */ -- mss = skb_shinfo(skb)->gso_size; -+ mss = skb_shinfo(skb)->tso_size; - if (mss != 0) { - /* just drop the packet if non-linear expansion fails */ - if (skb_header_cloned(skb) && -@@ -3083,7 +3084,6 @@ static struct ethtool_ops sky2_ethtool_o - .phys_id = sky2_phys_id, - .get_stats_count = sky2_get_stats_count, - .get_ethtool_stats = sky2_get_ethtool_stats, -- .get_perm_addr = ethtool_op_get_perm_addr, - }; - - /* Initialize network device */ -@@ -3158,7 +3158,6 @@ static __devinit struct net_device *sky2 - - /* read the mac address */ - memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); -- memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); - - /* device is off until link detection */ - netif_carrier_off(dev); -@@ -3206,7 +3205,7 @@ static int __devinit sky2_test_msi(struc - - sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW); - -- err = request_irq(pdev->irq, sky2_test_intr, IRQF_SHARED, DRV_NAME, hw); -+ err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw); - if (err) { - printk(KERN_ERR PFX "%s: cannot assign irq %d\n", - pci_name(pdev), pdev->irq); -@@ -3366,7 +3365,7 @@ static int __devinit sky2_probe(struct p - goto err_out_unregister; - } - -- err = request_irq(pdev->irq, sky2_intr, IRQF_SHARED, DRV_NAME, hw); -+ err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); - if (err) { - printk(KERN_ERR PFX "%s: cannot assign irq %d\n", - pci_name(pdev), pdev->irq); -@@ -3467,7 +3466,7 @@ static int sky2_suspend(struct pci_dev * - } - - sky2_write32(hw, B0_IMSK, 0); -- pci_save_state(pdev); -+ pci_save_state(pdev, pdev->saved_config_space); - sky2_set_power_state(hw, pstate); - return 0; - } -@@ -3477,7 +3476,7 @@ static int sky2_resume(struct pci_dev *p - struct sky2_hw *hw = pci_get_drvdata(pdev); - int i, err; - -- pci_restore_state(pdev); -+ pci_restore_state(pdev, pdev->saved_config_space); - pci_enable_wake(pdev, PCI_D0, 0); - sky2_set_power_state(hw, PCI_D0); - -diff -Nurap 78.9.sky2.1/drivers/net/sky2_compat.h 78.9.a/drivers/net/sky2_compat.h ---- 78.9.sky2.1/drivers/net/sky2_compat.h 2006-07-14 17:34:46.000000000 +0400 -+++ 78.9.a/drivers/net/sky2_compat.h 2006-07-14 17:45:43.000000000 +0400 -@@ -0,0 +1,65 @@ -+#ifndef __SKY2_COMPAT_H__ -+#define __SKY2_COMPAT_H__ -+ -+#define __read_mostly -+ -+#define skb_header_cloned(skb) 0 -+ -+//#define netif_rx_schedule_test(dev) netif_rx_schedule_prep(dev) -+ -+typedef u32 pm_message_t; -+ -+typedef int __bitwise pci_power_t; -+ -+#define PCI_D0 ((pci_power_t __force) 0) -+#define PCI_D1 ((pci_power_t __force) 1) -+#define PCI_D2 ((pci_power_t __force) 2) -+#define PCI_D3hot ((pci_power_t __force) 3) -+#define PCI_D3cold ((pci_power_t __force) 4) -+ -+#define pci_choose_state(pdev, state) (state) -+ -+static inline int skb_is_tso(const struct sk_buff *skb) -+{ -+ return skb_shinfo(skb)->tso_size; -+} -+ -+/* Test if receive needs to be scheduled */ -+static inline int __netif_rx_schedule_prep(struct net_device *dev) -+{ -+ return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state); -+} -+ -+static inline void setup_timer(struct timer_list * timer, -+ void (*function)(unsigned long), -+ unsigned long data) -+{ -+ timer->function = function; -+ timer->data = data; -+ init_timer(timer); -+} -+ -+#define __wait_event_timeout(wq, condition, ret) \ -+do { \ -+ DEFINE_WAIT(__wait); \ -+ \ -+ for (;;) { \ -+ prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \ -+ if (condition) \ -+ break; \ -+ ret = schedule_timeout(ret); \ -+ if (!ret) \ -+ break; \ -+ } \ -+ finish_wait(&wq, &__wait); \ -+} while (0) -+ -+#define wait_event_timeout(wq, condition, timeout) \ -+({ \ -+ long __ret = timeout; \ -+ if (!(condition)) \ -+ __wait_event_timeout(wq, condition, __ret); \ -+ __ret; \ -+}) -+ -+#endif /* __SKY2_COMPAT_H__ */ |