From 311c91775d97f0932231aa114e39a14cfeffef51 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 1 Jan 2010 11:11:17 +0000 Subject: kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches SVN-Revision: 18982 --- target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch') diff --git a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch index cc9f5f263e..026e9bdee9 100644 --- a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch @@ -834,7 +834,7 @@ #include #include #include -@@ -1686,7 +1689,11 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -1687,7 +1690,11 @@ int dev_hard_start_xmit(struct sk_buff * int rc; if (likely(!skb->next)) { @@ -847,7 +847,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1771,8 +1778,7 @@ u16 skb_tx_hash(const struct net_device +@@ -1772,8 +1779,7 @@ u16 skb_tx_hash(const struct net_device } EXPORT_SYMBOL(skb_tx_hash); @@ -857,7 +857,7 @@ { const struct net_device_ops *ops = dev->netdev_ops; u16 queue_index = 0; -@@ -1785,6 +1791,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -1786,6 +1792,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } @@ -1033,7 +1033,7 @@ new->csum = old->csum; new->local_df = old->local_df; new->pkt_type = old->pkt_type; -@@ -2778,6 +2867,13 @@ void __init skb_init(void) +@@ -2779,6 +2868,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); -- cgit v1.2.3