[kernel] r15024 - dists/lenny-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Wed Jan 27 01:06:20 2010
New Revision: 15024

Log:
add missing header file hunks

Modified:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch	Tue Jan 26 23:10:37 2010	(r15023)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000-enhance-frame-fragment-detection.patch	Wed Jan 27 01:06:20 2010	(r15024)
@@ -57,3 +57,14 @@
  			goto next_desc;
  		}
  
+--- linux-source-2.6.26/drivers/net/e1000/e1000.h.orig	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/drivers/net/e1000/e1000.h	2010-01-26 09:55:11.000000000 -0700
+@@ -342,6 +342,8 @@ struct e1000_adapter {
+ 	bool quad_port_a;
+ 	unsigned long flags;
+ 	u32 eeprom_wol;
++
++	bool discarding;
+ };
+ 
+ enum e1000_state_t {

Modified: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch	Tue Jan 26 23:10:37 2010	(r15023)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-frame-fragment-detection.patch	Wed Jan 27 01:06:20 2010	(r15024)
@@ -84,3 +84,28 @@
  	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]))