packages: kernel/kernel-imq.patch, kernel/kernel.spec - imq updated

[arekm]

Author: arekm                        Date: Sat Mar  6 20:31:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- imq updated

---- Files affected:
packages/kernel:
   kernel-imq.patch (1.6 -> 1.7) , kernel.spec (1.761 -> 1.762) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-imq.patch
diff -u packages/kernel/kernel-imq.patch:1.6 packages/kernel/kernel-imq.patch:1.7
--- packages/kernel/kernel-imq.patch:1.6	Tue Feb  2 16:55:02 2010
+++ packages/kernel/kernel-imq.patch	Sat Mar  6 21:31:07 2010
@@ -815,9 +815,9 @@
 +extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
  extern int		dev_queue_xmit(struct sk_buff *skb);
  extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice(struct net_device *dev);
- extern void		free_netdev(struct net_device *dev);
- extern void		synchronize_net(void);
+ extern void		unregister_netdevice_queue(struct net_device *dev,
+ 						   struct list_head *head);
+ extern void		unregister_netdevice_many(struct list_head *head);
 diff -U 5 -Nr linux-2.6.32/include/linux/netfilter/xt_IMQ.h linux-2.6.32-imq/include/linux/netfilter/xt_IMQ.h
 --- linux-2.6.32/include/linux/netfilter/xt_IMQ.h	1970-01-01 02:00:00.000000000 +0200
 +++ linux-2.6.32-imq/include/linux/netfilter/xt_IMQ.h	2009-12-11 14:16:42.679730960 +0200
@@ -1005,7 +1005,7 @@
 @@ -1702,11 +1705,15 @@
  {
  	const struct net_device_ops *ops = dev->netdev_ops;
- 	int rc;
+ 	int rc = NETDEV_TX_OK;
  
  	if (likely(!skb->next)) {
 -		if (!list_empty(&ptype_all))
@@ -1019,20 +1019,15 @@
  		if (netif_needs_gso(dev, skb)) {
  			if (unlikely(dev_gso_segment(skb)))
  				goto out_kfree_skb;
-@@ -1787,12 +1794,11 @@
- 
- 	return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
+@@ -1787,7 +1794,7 @@
+ 	return queue_index;
  }
- EXPORT_SYMBOL(skb_tx_hash);
  
 -static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
++struct netdev_queue *dev_pick_tx(struct net_device *dev,
+ 					struct sk_buff *skb)
  {
- 	const struct net_device_ops *ops = dev->netdev_ops;
- 	u16 queue_index = 0;
- 
- 	if (ops->ndo_select_queue)
+ 	u16 queue_index;
 @@ -1801,10 +1807,11 @@
  		queue_index = skb_tx_hash(dev, skb);
  
@@ -1147,7 +1142,7 @@
 +#endif
  
  /* Pipe buffer operations for a socket. */
- static struct pipe_buf_operations sock_pipe_buf_ops = {
+ static const struct pipe_buf_operations sock_pipe_buf_ops = {
  	.can_merge = 0,
  	.map = generic_pipe_buf_map,
 @@ -396,10 +476,30 @@

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.761 packages/kernel/kernel.spec:1.762
--- packages/kernel/kernel.spec:1.761	Sat Mar  6 21:17:49 2010
+++ packages/kernel/kernel.spec	Sat Mar  6 21:31:07 2010
@@ -237,7 +237,7 @@
 # http://zph.bratcheda.org/linux-2.6.26.3-zph.patch
 Patch49:	kernel-zph.patch
 
-# http://www.linuximq.net/patchs/linux-2.6.32-imq-test2.diff
+# based on http://www.linuximq.net/patchs/linux-2.6.32-imq-test2.diff
 Patch50:	kernel-imq.patch
 
 # http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-2.6.28.patch.bz2
@@ -1584,6 +1584,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.762  2010/03/06 20:31:07  arekm
+- imq updated
+
 Revision 1.761  2010/03/06 20:17:49  arekm
 - update tuxonice and vserver patches
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.761&r2=1.762&f=u