[kernel] r15084 - dists/etch-security/linux-2.6.24/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Mon Feb  1 05:07:57 2010
New Revision: 15084

Log:
adjust to apply

Modified:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch

Modified: dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch	Mon Feb  1 05:05:25 2010	(r15083)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch	Mon Feb  1 05:07:57 2010	(r15084)
@@ -17,12 +17,38 @@
     Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
     Signed-off-by: David S. Miller <davem at davemloft.net>
 
-Backported to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+Backported to Debian's 2.6.24 by dann frazier <dannf at debian.org>
 
-diff -urpN linux-source-2.6.26.orig/drivers/net/e1000e/netdev.c linux-source-2.6.26/drivers/net/e1000e/netdev.c
---- linux-source-2.6.26.orig/drivers/net/e1000e/netdev.c	2009-12-26 01:14:57.000000000 -0700
-+++ linux-source-2.6.26/drivers/net/e1000e/netdev.c	2010-01-22 16:16:43.000000000 -0700
-@@ -482,14 +482,24 @@ static bool e1000_clean_rx_irq(struct e1
+diff -urpN linux-source-2.6.24.orig/drivers/net/e1000e/e1000.h linux-source-2.6.24/drivers/net/e1000e/e1000.h
+--- linux-source-2.6.24.orig/drivers/net/e1000e/e1000.h	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/drivers/net/e1000e/e1000.h	2010-01-31 22:06:30.000000000 -0700
+@@ -267,11 +267,13 @@ struct e1000_adapter {
+ 	unsigned long led_status;
+ 
+ 	unsigned int flags;
++	unsigned int flags2;
+ };
+ 
+ struct e1000_info {
+ 	enum e1000_mac_type	mac;
+ 	unsigned int		flags;
++	unsigned int		flags2;
+ 	u32			pba;
+ 	s32			(*get_invariants)(struct e1000_adapter *);
+ 	struct e1000_mac_operations *mac_ops;
+@@ -311,6 +313,8 @@ struct e1000_info {
+ #define FLAG_RX_CSUM_ENABLED              (1 << 28)
+ #define FLAG_TSO_FORCE                    (1 << 29)
+ 
++#define FLAG2_IS_DISCARDING               (1 << 2)
++
+ #define E1000_RX_DESC_PS(R, i)	    \
+ 	(&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
+ #define E1000_GET_DESC(R, i, type)	(&(((struct type *)((R).desc))[i]))
+diff -urpN linux-source-2.6.24.orig/drivers/net/e1000e/netdev.c linux-source-2.6.24/drivers/net/e1000e/netdev.c
+--- linux-source-2.6.24.orig/drivers/net/e1000e/netdev.c	2009-11-04 18:42:03.000000000 -0700
++++ linux-source-2.6.24/drivers/net/e1000e/netdev.c	2010-01-31 22:06:30.000000000 -0700
+@@ -389,14 +389,24 @@ static bool e1000_clean_rx_irq(struct e1
  
  		length = le16_to_cpu(rx_desc->length);
  
@@ -50,7 +76,7 @@
  			goto next_desc;
  		}
  
-@@ -748,10 +758,16 @@ static bool e1000_clean_rx_irq_ps(struct
+@@ -648,10 +658,16 @@ static bool e1000_clean_rx_irq_ps(struct
  				 PCI_DMA_FROMDEVICE);
  		buffer_info->dma = 0;
  
@@ -68,7 +94,7 @@
  			goto next_desc;
  		}
  
-@@ -1111,6 +1127,7 @@ static void e1000_clean_rx_ring(struct e
+@@ -813,6 +829,7 @@ static void e1000_clean_rx_ring(struct e
  
  	rx_ring->next_to_clean = 0;
  	rx_ring->next_to_use = 0;
@@ -76,7 +102,7 @@
  
  	writel(0, adapter->hw.hw_addr + rx_ring->head);
  	writel(0, adapter->hw.hw_addr + rx_ring->tail);
-@@ -4727,6 +4744,7 @@ static int __devinit e1000_probe(struct 
+@@ -3764,6 +3781,7 @@ static int __devinit e1000_probe(struct 
  	adapter->ei = ei;
  	adapter->pba = ei->pba;
  	adapter->flags = ei->flags;
@@ -84,28 +110,3 @@
  	adapter->hw.adapter = adapter;
  	adapter->hw.mac.type = ei->mac;
  	adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
---- linux-source-2.6.26.orig/drivers/net/e1000e/e1000.h	2009-12-26 01:14:57.000000000 -0700
-+++ linux-source-2.6.26/drivers/net/e1000e/e1000.h	2010-01-26 11:17:32.000000000 -0700
-@@ -298,11 +298,13 @@ struct e1000_adapter {
- 	unsigned long led_status;
- 
- 	unsigned int flags;
-+	unsigned int flags2;
- };
- 
- struct e1000_info {
- 	enum e1000_mac_type	mac;
- 	unsigned int		flags;
-+	unsigned int		flags2;
- 	u32			pba;
- 	s32			(*get_variants)(struct e1000_adapter *);
- 	struct e1000_mac_operations *mac_ops;
-@@ -343,6 +345,8 @@ struct e1000_info {
- #define FLAG_RX_RESTART_NOW               (1 << 30)
- #define FLAG_MSI_TEST_FAILED              (1 << 31)
- 
-+#define FLAG2_IS_DISCARDING               (1 << 2)
-+
- #define E1000_RX_DESC_PS(R, i)	    \
- 	(&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
- #define E1000_GET_DESC(R, i, type)	(&(((struct type *)((R).desc))[i]))