From: Thomas Horsten <thomas.horsten@citrix.com>
Date: Thu, 26 Nov 2009 14:35:15 +0000 (+0000)
Subject: [package/xenclinet/wifi-backports] Fixes to xenkernel compatibility patch
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=15c6d9cd2bcdf13be1fdcc6eda30b0276546de1f;p=xenclient%2Fbuild.git

[package/xenclinet/wifi-backports] Fixes to xenkernel compatibility patch
---

diff --git a/package/xenclient/wifi_backports/xenkernel-compat.patch b/package/xenclient/wifi_backports/xenkernel-compat.patch
index ae5f38e..ac6ed9c 100644
--- a/package/xenclient/wifi_backports/xenkernel-compat.patch
+++ b/package/xenclient/wifi_backports/xenkernel-compat.patch
@@ -1,5 +1,24 @@
+diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c
+index c379b19..7e9ca1e 100644
+--- a/compat/compat-2.6.28.c
++++ b/compat/compat-2.6.28.c
+@@ -260,6 +260,7 @@ static unsigned long round_jiffies_common(unsigned long j, int cpu,
+ 	return j;
+ }
+ 
++#if 0
+ /**
+  * round_jiffies_up - function to round jiffies up to a full second
+  * @j: the time in (absolute) jiffies that should be rounded
+@@ -284,5 +285,6 @@ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 	skb->truesize += size;
+ }
+ EXPORT_SYMBOL(skb_add_rx_frag);
++#endif
+ 
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */
 diff --git a/net/wireless/compat-2.6.28.c b/net/wireless/compat-2.6.28.c
-index 33871a2..2369fa1 100644
+index c379b19..5ba1ab6 100644
 --- a/net/wireless/compat-2.6.28.c
 +++ b/net/wireless/compat-2.6.28.c
 @@ -222,6 +222,7 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
@@ -10,10 +29,27 @@ index 33871a2..2369fa1 100644
  static unsigned long round_jiffies_common(unsigned long j, int cpu,
  		bool force_up)
  {
-@@ -274,5 +275,6 @@ unsigned long round_jiffies_up(unsigned long j)
- 	return round_jiffies_common(j, raw_smp_processor_id(), true);
+@@ -284,5 +285,6 @@ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
+ 	skb->truesize += size;
  }
- EXPORT_SYMBOL_GPL(round_jiffies_up);
+ EXPORT_SYMBOL(skb_add_rx_frag);
 +#endif
  
  #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */
+diff --git a/include/net/compat-2.6.28.h b/include/net/compat-2.6.28.h
+index f158cbe..26888e0 100644
+--- a/include/net/compat-2.6.28.h
++++ b/include/net/compat-2.6.28.h
+@@ -171,10 +171,12 @@ static inline void skb_queue_splice_tail_init(struct sk_buff_head *list,
+ 
+ #endif
+ 
++#if 0
+ /* openSuse includes round_jiffies_up in it's kernel 2.6.27.
+  * This is needed to prevent conflicts with the openSuse definition.
+  */
+ #define round_jiffies_up backport_round_jiffies_up
++#endif
+ 
+ unsigned long round_jiffies_up(unsigned long j);
+