Author: mguevara Date: Thu Oct 23 00:40:48 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- changed skb_trim call arg b: skb->tail is of sk_buff_data_t type which is
unsigned int or unsigned char * depending on BITS_PER_LONG > 32
(see include/linux/skbuff.h)
---- Files affected:
SOURCES:
kernel-wrr.patch (1.1.4.1 -> 1.1.4.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-wrr.patch
diff -u SOURCES/kernel-wrr.patch:1.1.4.1 SOURCES/kernel-wrr.patch:1.1.4.2
--- SOURCES/kernel-wrr.patch:1.1.4.1 Thu Oct 23 02:19:50 2008
+++ SOURCES/kernel-wrr.patch Thu Oct 23 02:40:43 2008
@@ -1317,7 +1317,7 @@
+static int wrr_dump(struct Qdisc *sch, struct sk_buff *skb)
+{
+ struct wrr_sched_data *q = qdisc_priv(sch);
-+ unsigned char *b = skb->tail;
++ sk_buff_data_t b = skb->tail;
+ struct tc_wrr_qdisc_stats opt;
+
+ opt.qdisc_crt.qdisc_modf = q->qdisc_modf;
@@ -1343,7 +1343,7 @@
+ return skb->len;
+
+ nla_put_failure: /* NLA_PUT may jump to this label */
-+ skb_trim(skb, b - skb->data);
++ skb_trim(skb, (unsigned char *) &b - skb->data);
+ return -1;
+}
+
@@ -1479,7 +1479,7 @@
+ struct sk_buff *skb, struct tcmsg *tcm)
+{
+ struct wrr_sched_data *q = qdisc_priv(sch);
-+ unsigned char *b = skb->tail;
++ sk_buff_data_t b = skb->tail;
+ struct tc_wrr_class_stats opt;
+
+ /* Handle of this class */
@@ -1522,7 +1522,7 @@
+ return skb->len;
+
+ nla_put_failure: /* NLA_PUT may jump here */
-+ skb_trim(skb, b - skb->data);
++ skb_trim(skb, (unsigned char *) &b - skb->data);
+ return -1;
+}
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-wrr.patch?r1=1.1.4.1&r2=1.1.4.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
