Author: pluto Date: Wed Oct 12 15:08:20 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- atmdd fix moved.
---- Files affected:
SOURCES:
linux-2.6-atmdd.patch (1.1 -> 1.1.2.1) , kernel-hotfixes.patch (1.1.2.64 ->
1.1.2.65)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-atmdd.patch
diff -u SOURCES/linux-2.6-atmdd.patch:1.1 SOURCES/linux-2.6-atmdd.patch:1.1.2.1
--- SOURCES/linux-2.6-atmdd.patch:1.1 Thu Aug 25 19:06:36 2005
+++ SOURCES/linux-2.6-atmdd.patch Wed Oct 12 17:08:15 2005
@@ -30,7 +30,7 @@
diff -urN linux-2.4.25/drivers/atm/atmdd.c
linux-2.4.25-atmdd/drivers/atm/atmdd.c
--- linux-2.4.25/drivers/atm/atmdd.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.25-atmdd/drivers/atm/atmdd.c 2004-02-29 22:58:11.000000000
+0100
-@@ -0,0 +1,920 @@
+@@ -0,0 +1,922 @@
+/*
+#######################################################################
+#
@@ -244,6 +244,7 @@
+ while ((skb = myatmdd_rxq_dequeue(&priv->rxqueue, &pkt_len)))
+ {
+ struct sk_buff *newskb;
++ struct timeval stamp;
+
+ /* Get a new skb to replace the one just consumed */
+ if (!(newskb = dev_alloc_skb(AAL5_BUFLEN)))
@@ -275,7 +276,8 @@
+ atomic_inc(&vcc->stats->rx);
+
+ /* add timestamp for upper layers to use */
-+ do_gettimeofday(&skb->stamp);
++ do_gettimeofday(&stamp);
++ skb_set_timestamp(skb, &stamp);
+
+ /* Point socket buffer at the right VCC before giving to socket
layer */
+ ATM_SKB(skb)->vcc = vcc;
================================================================
Index: SOURCES/kernel-hotfixes.patch
diff -u SOURCES/kernel-hotfixes.patch:1.1.2.64
SOURCES/kernel-hotfixes.patch:1.1.2.65
--- SOURCES/kernel-hotfixes.patch:1.1.2.64 Tue Oct 11 16:18:58 2005
+++ SOURCES/kernel-hotfixes.patch Wed Oct 12 17:08:15 2005
@@ -133,23 +133,3 @@
/* Used by sysrq-p, among others. I don't believe r9-r15 are ever
saved in the context it's used. */
---- a/drivers/atm/atmdd.c 2005-10-03 13:17:48.000000000 +0200
-+++ b/drivers/atm/atmdd.c 2005-10-03 17:51:59.322010250 +0200
-@@ -211,6 +211,7 @@
- while ((skb = myatmdd_rxq_dequeue(&priv->rxqueue, &pkt_len)))
- {
- struct sk_buff *newskb;
-+ struct timeval stamp;
-
- /* Get a new skb to replace the one just consumed */
- if (!(newskb = dev_alloc_skb(AAL5_BUFLEN)))
-@@ -242,7 +243,8 @@
- atomic_inc(&vcc->stats->rx);
-
- /* add timestamp for upper layers to use */
-- do_gettimeofday(&skb->stamp);
-+ do_gettimeofday(&stamp);
-+ skb_set_timestamp(skb, &stamp);
-
- /* Point socket buffer at the right VCC before giving to socket
layer */
- ATM_SKB(skb)->vcc = vcc;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-atmdd.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/kernel-hotfixes.patch?r1=1.1.2.64&r2=1.1.2.65&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
