From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 15 Oct 2008 17:01:00 +0000 (+0200)
Subject: Fix ATL2 transmited bytes counter
X-Git-Tag: v2.3-rc1~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7364da0c24cfb3acd106b215dea4ab38706fd2ba;p=ipfire-2.x.git

Fix ATL2 transmited bytes counter
Removed obsolete ATL2 device id patch
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6468f94358..11e42ab959 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.3-beta5 ==
+== List of softwares used to build IPFire Version: 2.3-test ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27
@@ -41,7 +41,7 @@
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.18
-* atl2-2.0.4-kmod-2.6.25.18
+* atl2-2.0.5-kmod-2.6.25.18
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
@@ -68,7 +68,7 @@
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-004
-* cups-1.3.7
+* cups-1.3.9
 * curl-7.15.3
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
diff --git a/lfs/atl2 b/lfs/atl2
index 26e4f64ec1..8200bef811 100644
--- a/lfs/atl2
+++ b/lfs/atl2
@@ -78,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/atl2_pci_vendor_id.patch 
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/atl2_add_tx_bytes_statistic.patch 
 ifeq "$(SMP)" "1"
 	cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP) modules
 	cd $(DIR_APP) && install -m 644 atl2.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net 
diff --git a/src/patches/atl2_add_tx_bytes_statistic.patch b/src/patches/atl2_add_tx_bytes_statistic.patch
new file mode 100644
index 0000000000..cea68a2736
--- /dev/null
+++ b/src/patches/atl2_add_tx_bytes_statistic.patch
@@ -0,0 +1,15 @@
+diff -Naur atl2-2.0.5.org/atl2_main.c atl2-2.0.5/atl2_main.c
+--- atl2-2.0.5.org/atl2_main.c	2008-08-04 17:53:21.000000000 +0200
++++ atl2-2.0.5/atl2_main.c	2008-10-15 18:53:12.000000000 +0200
+@@ -572,8 +572,10 @@
+ 		atomic_set(&adapter->txd_read_ptr, (int)txd_read_ptr);
+ 
+ 		// tx statistics:
+-		if (txs->ok)
++		if (txs->ok) {
++			adapter->net_stats.tx_bytes += txs->pkt_size;
+ 			adapter->net_stats.tx_packets++;
++		}
+ 		else
+ 			adapter->net_stats.tx_errors++;
+ 
diff --git a/src/patches/atl2_pci_vendor_id.patch b/src/patches/atl2_pci_vendor_id.patch
deleted file mode 100644
index a94fed174f..0000000000
--- a/src/patches/atl2_pci_vendor_id.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur atl2-2.0.4.org/atl2_main.c atl2-2.0.4/atl2_main.c
---- atl2-2.0.4.org/atl2_main.c	2008-01-28 23:16:38.000000000 +0100
-+++ atl2-2.0.4/atl2_main.c	2008-06-23 20:46:04.000000000 +0200
-@@ -61,6 +61,10 @@
- MODULE_VERSION(ATL2_DRV_VERSION);
- 
- /* FIXME: remove this after merging, goes in pci_ids.h */
-+#ifndef PCI_VENDOR_ID_ATTANSIC
-+#define PCI_VENDOR_ID_ATTANSIC		0x1969
-+#endif
-+
- #ifndef PCI_DEVICE_ID_ATTANSIC_L2
- #define PCI_DEVICE_ID_ATTANSIC_L2	0x2048
- #endif