aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-11-16 08:00:07 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-11-16 08:00:07 +0000
commit5a691fb28afee8522a2f6cadea14494dc121a7ae (patch)
treebd2a19e7865c9d76709ef99539b4cc741d555599
parentcaefcca898c3b6632b8a60b500d3586102e1085c (diff)
downloadupstream-5a691fb28afee8522a2f6cadea14494dc121a7ae.tar.gz
upstream-5a691fb28afee8522a2f6cadea14494dc121a7ae.tar.bz2
upstream-5a691fb28afee8522a2f6cadea14494dc121a7ae.zip
linux/generic: switch to userspace __aligned_u64 calls.
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff_plain;h=79b5dc0c64d88cda3da23b2e22a5cec0964372ac (thank you hauke) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24012 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-2.6.36/031-aligned_u64.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/031-aligned_u64.patch b/target/linux/generic/patches-2.6.36/031-aligned_u64.patch
new file mode 100644
index 0000000000..d0851d8f15
--- /dev/null
+++ b/target/linux/generic/patches-2.6.36/031-aligned_u64.patch
@@ -0,0 +1,25 @@
+--- a/include/linux/if_ppp.h
++++ b/include/linux/if_ppp.h
+@@ -114,14 +114,14 @@ struct pppol2tp_ioc_stats {
+ __u16 tunnel_id; /* redundant */
+ __u16 session_id; /* if zero, get tunnel stats */
+ __u32 using_ipsec:1; /* valid only for session_id == 0 */
+- aligned_u64 tx_packets;
+- aligned_u64 tx_bytes;
+- aligned_u64 tx_errors;
+- aligned_u64 rx_packets;
+- aligned_u64 rx_bytes;
+- aligned_u64 rx_seq_discards;
+- aligned_u64 rx_oos_packets;
+- aligned_u64 rx_errors;
++ __aligned_u64 tx_packets;
++ __aligned_u64 tx_bytes;
++ __aligned_u64 tx_errors;
++ __aligned_u64 rx_packets;
++ __aligned_u64 rx_bytes;
++ __aligned_u64 rx_seq_discards;
++ __aligned_u64 rx_oos_packets;
++ __aligned_u64 rx_errors;
+ };
+
+ #define ifr__name b.ifr_ifrn.ifrn_name