[paketler-commits] r6338 - devel/kernel/kernel/files/gentoo

[paketler-uludag at uludag.org.tr]

Author: caglar
Date: Tue Apr 18 16:01:18 2006
New Revision: 6338

Modified:
   devel/kernel/kernel/files/gentoo/sky2-1.1.patch
Log:
correct

Modified: devel/kernel/kernel/files/gentoo/sky2-1.1.patch
=================================================================
--- devel/kernel/kernel/files/gentoo/sky2-1.1.patch	(original)
+++ devel/kernel/kernel/files/gentoo/sky2-1.1.patch	Tue Apr 18 16:01:18 2006
@@ -1,5 +1,5 @@
 diff -ur linux-2.6.16.7.orig/drivers/net/sky2.c linux-2.6.16.7/drivers/net/sky2.c
---- inux-2.6.16.7.orig/drivers/net/sky2.c	2006-04-18 14:52:35.000000000 +0300
+--- linux-2.6.16.7.orig/drivers/net/sky2.c	2006-04-18 14:52:35.000000000 +0300
 +++ linux-2.6.16.7/drivers/net/sky2.c	2006-04-18 14:55:04.000000000 +0300
 @@ -51,7 +51,7 @@
  #include "sky2.h"
@@ -1047,7 +1047,7 @@
  	pci_disable_device(pdev);
 diff -ur linux-2.6.16.7.orig/drivers/net/sky2.h linux-2.6.16.7/drivers/net/sky2.h
 --- linux-2.6.16.7.orig/drivers/net/sky2.h	2006-04-18 14:52:35.000000000 +0300
-+++ linux-2.6.16.7/drivers/net/sky2.h	2006-04-18 14:57:20.000000000 +0300
++++ linux-2.6.16.7/drivers/net/sky2.h	2006-04-18 15:58:40.000000000 +0300
 @@ -278,13 +278,11 @@
  	Y2_IS_CHK_TXS1	= 1<<1,		/* Descriptor error TXS 1 */
  	Y2_IS_CHK_TXA1	= 1<<0,		/* Descriptor error TXA 1 */
@@ -1067,7 +1067,7 @@
  };
  
  /*	B2_IRQM_HWE_MSK	32 bit	IRQ Moderation HW Error Mask */
-@@ -1375,24 +1373,20 @@
+@@ -1375,24 +1373,22 @@
  	GM_SMI_CTRL	= 0x0080,	/* 16 bit r/w	SMI Control Register */
  	GM_SMI_DATA	= 0x0084,	/* 16 bit r/w	SMI Data Register */
  	GM_PHY_ADDR	= 0x0088,	/* 16 bit r/w	GPHY Address Register */
@@ -1088,6 +1088,8 @@
  enum {
 -	GM_RXF_UC_OK  = GM_MIB_CNT_BASE + 0,	/* Unicast Frames Received OK */
 -	GM_RXF_BC_OK	= GM_MIB_CNT_BASE + 8,	/* Broadcast Frames Received OK */
++    GM_RXF_UC_OK    = GM_MIB_CNT_BASE + 0,  /* Unicast Frames Received OK */
++    GM_RXF_BC_OK    = GM_MIB_CNT_BASE + 8,  /* Broadcast Frames Received OK */
  	GM_RXF_MPAUSE	= GM_MIB_CNT_BASE + 16,	/* Pause MAC Ctrl Frames Received */
  	GM_RXF_MC_OK	= GM_MIB_CNT_BASE + 24,	/* Multicast Frames Received OK */
  	GM_RXF_FCS_ERR	= GM_MIB_CNT_BASE + 32,	/* Rx Frame Check Seq. Error */
@@ -1096,7 +1098,7 @@
  	GM_RXO_OK_LO	= GM_MIB_CNT_BASE + 48,	/* Octets Received OK Low */
  	GM_RXO_OK_HI	= GM_MIB_CNT_BASE + 56,	/* Octets Received OK High */
  	GM_RXO_ERR_LO	= GM_MIB_CNT_BASE + 64,	/* Octets Received Invalid Low */
-@@ -1400,37 +1394,36 @@
+@@ -1400,37 +1396,36 @@
  	GM_RXF_SHT	= GM_MIB_CNT_BASE + 80,	/* Frames <64 Byte Received OK */
  	GM_RXE_FRAG	= GM_MIB_CNT_BASE + 88,	/* Frames <64 Byte Received with FCS Err */
  	GM_RXF_64B	= GM_MIB_CNT_BASE + 96,	/* 64 Byte Rx Frame */
@@ -1164,7 +1166,7 @@
  };
  
  /* GMAC Bit Definitions */
-@@ -1833,6 +1826,7 @@
+@@ -1833,6 +1828,7 @@
  	struct net_device    *netdev;
  	unsigned	     port;
  	u32		     msg_enable;
@@ -1172,7 +1174,7 @@
  
  	spinlock_t	     tx_lock  ____cacheline_aligned_in_smp;
  	struct tx_ring_info  *tx_ring;
-@@ -1841,7 +1835,6 @@
+@@ -1841,7 +1837,6 @@
  	u16		     tx_prod;		/* next le to use */
  	u32		     tx_addr64;
  	u16		     tx_pending;
@@ -1180,7 +1182,7 @@
  	u16		     tx_last_mss;
  
  	struct ring_info     *rx_ring ____cacheline_aligned_in_smp;
-@@ -1850,7 +1843,6 @@
+@@ -1850,7 +1845,6 @@
  	u16		     rx_next;		/* next re to check */
  	u16		     rx_put;		/* next le index to use */
  	u16		     rx_pending;
@@ -1188,7 +1190,7 @@
  	u16		     rx_bufsize;
  #ifdef SKY2_VLAN_TAG_USED
  	u16		     rx_tag;
-@@ -1866,20 +1858,15 @@
+@@ -1866,20 +1860,15 @@
  	u8		     rx_pause;
  	u8		     tx_pause;
  	u8		     rx_csum;
@@ -1209,7 +1211,7 @@
  
  	int		     pm_cap;
  	u8	     	     chip_id;
-@@ -1890,6 +1877,8 @@
+@@ -1890,6 +1879,8 @@
  	struct sky2_status_le *st_le;
  	u32		     st_idx;
  	dma_addr_t   	     st_dma;